Back up manifold upgrade - looks like we're not ready for 3.0 yet.

BRL-CAD · Feb 19, 2025 · 0c539a0 · 0c539a0
1 parent 7ac50ea
commit 0c539a0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 50 deletions.
diff --git a/manifold/CMakeLists.txt b/manifold/CMakeLists.txt
@@ -14,17 +14,13 @@ if (ENABLE_MANIFOLD)
   ExternalProject_Add(MANIFOLD_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/manifold"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/manifold.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DASSETIMPORT_ROOT=$<$<BOOL:${ASSETIMPORT_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dpugixml_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
     -DMANIFOLD_TEST=OFF
     -DMANIFOLD_EXPORT=ON
-    -DMANIFOLD_OPTIMIZED=ON
-    $<$<BOOL:${PUGIXML_TARGET}>:-DREQUIRE_EXT_PUGIXML=ON>
     -DGLM_BUILD_LIBRARY=OFF
     -DGLM_BUILD_INSTALL=ON
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -44,7 +40,7 @@ if (ENABLE_MANIFOLD)
 
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/manifold/LICENSE
+    ${CMAKE_CURRENT_SOURCE_DIR}/manifold/LICENSES.txt
     ${DOC_LICENSE_DIR}/manifold.txt
     COPYONLY
     )

diff --git a/manifold/manifold b/manifold/manifold
diff --git a/manifold/manifold.deps b/manifold/manifold.deps
@@ -1,4 +1,3 @@
 PATCH
-PUGIXML
 ASSETIMPORT
 
diff --git a/manifold/manifold.patch b/manifold/manifold.patch