From 43ea596252c784cf471162e871e5aed2d24585fd Mon Sep 17 00:00:00 2001 From: Aidan Case Date: Mon, 26 Feb 2024 18:05:57 -0600 Subject: [PATCH] do "proper" patching of wxwidgets --- deps/CMakeLists.txt | 2 +- deps/wxWidgets/wxWidgets.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 4bbefac573..a54b0521a5 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -94,7 +94,7 @@ message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}") find_package(Git REQUIRED) # The default command line for patching. Only works for newer -set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix) +set(PATCH_CMD ${GIT_EXECUTABLE} apply --apply --verbose --ignore-space-change --whitespace=fix) if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 1861b2f0e4..f84ef3798a 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -23,7 +23,7 @@ else () endif () if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(_patch_cmd ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch) + set(_patch_cmd cat ${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-building-WebView-with-libwebkit2gtk-.patch | patch -p1) endif () orcaslicer_add_cmake_project(