git: 59fb9b948f46 - main - cad/PrusaSlicer: Fix build when math/qhull is present.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Jan 2022 17:49:06 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=59fb9b948f46dc099ce54d623b69c809f0a75b98
commit 59fb9b948f46dc099ce54d623b69c809f0a75b98
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2022-01-15 17:47:08 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2022-01-15 17:47:08 +0000
cad/PrusaSlicer: Fix build when math/qhull is present.
Maintainer timeout.
PR: 259941
Reported by: alt2600@icloud.com
---
.../files/patch-src_qhull_CMakeLists.txt | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt
new file mode 100644
index 000000000000..ce0b95dc9110
--- /dev/null
+++ b/cad/PrusaSlicer/files/patch-src_qhull_CMakeLists.txt
@@ -0,0 +1,29 @@
+--- src/qhull/CMakeLists.txt.orig 2021-11-19 21:23:46.166100000 -0500
++++ src/qhull/CMakeLists.txt 2021-11-19 21:27:12.170235000 -0500
+@@ -14,19 +14,8 @@
+
+ add_library(qhull INTERFACE)
+
+-if(Qhull_FOUND)
++#force use of bundled qhull#else(Qhull_FOUND)
+
+-message(STATUS "Using qhull from system.")
+-if(SLIC3R_STATIC)
+- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhullstatic_r" RelWithDebInfo Release)
+- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhullstatic_r)
+-else()
+- slic3r_remap_configs("Qhull::qhullcpp;Qhull::qhull_r" RelWithDebInfo Release)
+- target_link_libraries(qhull INTERFACE Qhull::qhullcpp Qhull::qhull_r)
+-endif()
+-
+-else(Qhull_FOUND)
+-
+ project(qhull)
+ cmake_minimum_required(VERSION 2.6)
+
+@@ -144,4 +133,4 @@
+ target_include_directories(${qhull_STATIC} BEFORE PUBLIC ${LIBDIR}/qhull/src)
+ target_link_libraries(qhull INTERFACE ${qhull_STATIC})
+
+-endif()
++#force use of bundled qhull##endif()