[misc] Fix embedded shared library optional loading.

duburcqa · Aug 9, 2023 · f62e10e · f62e10e
1 parent 536027f
commit f62e10e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build_tools/build_install_deps_unix.sh b/build_tools/build_install_deps_unix.sh
@@ -325,7 +325,7 @@ cmake "$RootDir/assimp" \
       -DCMAKE_OSX_ARCHITECTURES="${OSX_ARCHITECTURES}" -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
       -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
       -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON \
-      -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF \
+      -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF \
       -DASSIMP_BUILD_SAMPLES=OFF -DBUILD_DOCS=OFF \
       -DCMAKE_C_FLAGS="${CMAKE_CXX_FLAGS}" -DCMAKE_CXX_FLAGS_RELEASE_INIT="" \
       -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -Wno-strict-overflow -Wno-tautological-compare $(

diff --git a/build_tools/build_install_deps_windows.ps1 b/build_tools/build_install_deps_windows.ps1
@@ -307,7 +307,7 @@ Set-Location -Path "$RootDir/assimp/build"
 cmake "$RootDir/assimp" -Wno-dev -G "${GENERATOR}" -DCMAKE_GENERATOR_PLATFORM=x64 `
       -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" `
       -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX="$InstallDir" `
-      -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF `
+      -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_TESTS=OFF `
       -DASSIMP_BUILD_SAMPLES=OFF -DBUILD_DOCS=OFF -DASSIMP_INSTALL_PDB=OFF `
       -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} /wd4005" `
       -DCMAKE_C_FLAGS="${CMAKE_CXX_FLAGS}"

diff --git a/build_tools/wheel_repair_linux.py b/build_tools/wheel_repair_linux.py
@@ -13,7 +13,7 @@
 
 
 WHITE_LIST_DEPS = (
-    "boost_python",) #"boost_numpy", "eigenpy", "hpp-fcl", "pinocchio")
+    "boost_python", "boost_numpy", "eigenpy", "hpp-fcl", "pinocchio")
 
 
 copylib_orig = auditwheel.repair.copylib

diff --git a/build_tools/wheel_repair_win.py b/build_tools/wheel_repair_win.py
@@ -19,7 +19,7 @@
 
 
 WHITE_LIST_DEPS = (
-    "boost_python",) #"boost_numpy", "eigenpy", "hpp-fcl", "pinocchio")
+    "boost_python", "boost_numpy", "eigenpy", "hpp-fcl", "pinocchio")
 
 
 def hash_filename(filepath, blocksize=65536):