Use upstream Qhull, remove duplication in deps and src

REALfloat is not defined to 0 on all platforms.
eemaffeo · Apr 4, 2022 · 1070d71 · 1070d71
1 parent 057232a
commit 1070d71
Show file tree

Hide file tree

Showing 238 changed files with 13 additions and 104,166 deletions.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -195,19 +195,16 @@ set(_dep_list
     dep_OpenVDB
     dep_OpenCSG
     dep_CGAL
+    dep_Qhull
     ${PNG_PKG}
     ${ZLIB_PKG}
     ${EXPAT_PKG}
     )
 
-if (MSVC)
-    # Experimental
-    #list(APPEND _dep_list "dep_qhull")
-else()
-    list(APPEND _dep_list "dep_Qhull")
+# if (NOT MSVC)
     # Not working, static build has different Eigen
     #list(APPEND _dep_list "dep_libigl")
-endif()
+# endif()
 
 add_custom_target(deps ALL DEPENDS ${_dep_list})
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory(boost)
 add_subdirectory(clipper)
 add_subdirectory(miniz)
 add_subdirectory(glu-libtess)
-add_subdirectory(qhull)
 add_subdirectory(Shiny)
 add_subdirectory(semver)
 add_subdirectory(libigl)
@@ -19,6 +18,16 @@ add_subdirectory(qoi)
 # Adding libnest2d project for bin packing...
 add_subdirectory(libnest2d)
 
+find_package(Qhull 7.2 REQUIRED)
+add_library(qhull INTERFACE)
+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()
+
 add_subdirectory(libslic3r)
 
 if (SLIC3R_GUI)

diff --git a/src/qhull/Announce.txt b/src/qhull/Announce.txt
diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
diff --git a/src/qhull/COPYING.txt b/src/qhull/COPYING.txt