patching find_package call

schrodinger · Feb 26, 2025 · 6684810 · 6684810
1 parent 846509f
commit 6684810
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -148,8 +148,8 @@ ExternalProject_Add(
   GIT_SHALLOW TRUE
   USES_TERMINAL_CONFIGURE ON
   USES_TERMINAL_BUILD ON
-  PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/rdkit.patch
-  UPDATE_DISCONNECTED 1 # required to not apply patch again once populated
+  PATCH_COMMAND git reset --hard HEAD && git apply ${CMAKE_CURRENT_SOURCE_DIR}/rdkit_static_build.patch && git apply ${CMAKE_CURRENT_SOURCE_DIR}/rdkit_find_boost.patch
+#   UPDATE_DISCONNECTED 1 # required to not apply patch again once populated
   CMAKE_ARGS
     ${COMMON_EXTERNAL_PROJECT_CMAKE_ARGS}
     -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/rdkit-${RDKIT_VERSION}

diff --git a/external/rdkit.patch → external/rdkit_static_build.patch b/external/rdkit.patch → external/rdkit_static_build.patch
diff --git a/external/rdkit_wasm_find_boost.patch b/external/rdkit_wasm_find_boost.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1abad9260..ae1938dd6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,7 +308,7 @@ if(RDK_BUILD_PYTHON_WRAPPERS)
+   endif()
+
+
+-  find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}" "numpy${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}" REQUIRED CONFIG)
++  find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}" "numpy${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}" REQUIRED CONFIG NO_CMAKE_FIND_ROOT_PATH)
+
+   target_link_libraries(rdkit_py_base INTERFACE "Boost::python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}" "Boost::numpy${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
+