forked from prusa3d/PrusaSlicer
-
-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated BuildMacOS.sh to support XCode builds
updated Qhull.cmake to add patch to the imported Qhull CMakeLists.txt so that it creates correctly named debug libraries. #3173
- Loading branch information
1 parent
18877dc
commit 2e6c5e3
Showing
3 changed files
with
56 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,20 @@ | ||
include(GNUInstallDirs) | ||
|
||
set(_patch_step "") | ||
if (APPLE) | ||
set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/Qhull.patch) | ||
endif () | ||
|
||
|
||
prusaslicer_add_cmake_project(Qhull | ||
URL "https://github.com/qhull/qhull/archive/v8.0.1.zip" | ||
URL_HASH SHA256=5287f5edd6a0372588f5d6640799086a4033d89d19711023ef8229dd9301d69b | ||
"${_patch_step}" | ||
CMAKE_ARGS | ||
-DINCLUDE_INSTALL_DIR=${CMAKE_INSTALL_INCLUDEDIR} | ||
) | ||
|
||
|
||
if (MSVC) | ||
add_debug_dep(dep_Qhull) | ||
endif () |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--- CMakeLists.txt 2020-08-04 20:37:02.000000000 -0700 | ||
+++ CMakeLists.txt 2022-08-14 12:02:28.000000000 -0700 | ||
@@ -339,21 +339,21 @@ | ||
|
||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) | ||
|
||
-if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug") | ||
- set(qhull_CPP qhullcpp_d) | ||
- set(qhull_SHARED qhull_d) | ||
- set(qhull_SHAREDP qhull_pd) | ||
- set(qhull_SHAREDR qhull_rd) | ||
- set(qhull_STATIC qhullstatic_d) | ||
- set(qhull_STATICR qhullstatic_rd) | ||
-else() | ||
+#if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug") | ||
+# set(qhull_CPP qhullcpp_d) | ||
+# set(qhull_SHARED qhull_d) | ||
+# set(qhull_SHAREDP qhull_pd) | ||
+# set(qhull_SHAREDR qhull_rd) | ||
+# set(qhull_STATIC qhullstatic_d) | ||
+# set(qhull_STATICR qhullstatic_rd) | ||
+#else() | ||
set(qhull_CPP qhullcpp) | ||
set(qhull_SHARED libqhull) # Temporarily avoid name conflict with qhull executable | ||
set(qhull_SHAREDP qhull_p) | ||
set(qhull_SHAREDR qhull_r) | ||
set(qhull_STATIC qhullstatic) | ||
set(qhull_STATICR qhullstatic_r) | ||
-endif() | ||
+#endif() | ||
|
||
set( | ||
qhull_TARGETS_INSTALL |