3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-24 05:15:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

do "proper" patching of wxwidgets

Browse source
This commit is contained in:
Aidan Case 2024-02-26 18:05:57 -06:00
parent 276774fa44
commit 43ea596252
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deps/CMakeLists.txt vendored
View file

@ -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)

2
deps/wxWidgets/wxWidgets.cmake vendored
View file

@ -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(