mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-03 21:44:30 +08:00
Fix build with Boost 1.89.0 (#8694)
This commit is contained in:
@@ -437,7 +437,7 @@ else()
|
||||
endif()
|
||||
|
||||
if(RDK_USE_BOOST_SERIALIZATION)
|
||||
find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS system serialization iostreams REQUIRED CONFIG)
|
||||
find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS serialization iostreams REQUIRED CONFIG)
|
||||
target_link_libraries(rdkit_base INTERFACE ${Boost_LIBRARIES})
|
||||
target_compile_definitions(rdkit_base INTERFACE -DRDK_USE_BOOST_SERIALIZATION)
|
||||
if(NOT Boost_USE_STATIC_LIBS)
|
||||
@@ -447,7 +447,7 @@ endif()
|
||||
|
||||
if(RDK_USE_BOOST_IOSTREAMS)
|
||||
target_compile_definitions(rdkit_base INTERFACE -DRDK_USE_BOOST_IOSTREAMS)
|
||||
find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS system iostreams REQUIRED CONFIG)
|
||||
find_package(Boost ${RDK_BOOST_VERSION} COMPONENTS iostreams REQUIRED CONFIG)
|
||||
target_link_libraries(rdkit_base INTERFACE ${Boost_LIBRARIES})
|
||||
|
||||
if (NOT Boost_USE_STATIC_LIBS)
|
||||
|
||||
@@ -13,7 +13,7 @@ add_compile_options(-Wall)
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
set(Boost_USE_MULTITHREADED OFF)
|
||||
set(Boost_USE_STATIC_RUNTIME ON)
|
||||
find_package( Boost COMPONENTS iostreams filesystem system)
|
||||
find_package( Boost COMPONENTS iostreams filesystem)
|
||||
find_package( Cairo REQUIRED )
|
||||
|
||||
# specify where CMake can find the RDKit libraries
|
||||
|
||||
@@ -24,7 +24,7 @@ set(RDKit_HAS_URF_SUPPORT @RDK_USE_URF@)
|
||||
set(RDKit_USE_OPTIMIZED_POPCNT @RDK_OPTIMIZE_POPCNT@)
|
||||
set(RDKit_USE_STRICT_ROTOR_DEFINITION @RDK_USE_STRICT_ROTOR_DEFINITION@)
|
||||
set(RDKit_USE_BOOST_VERSION @Boost_VERSION_STRING@)
|
||||
set(RDKit_USE_BOOST_COMPONENTS system)
|
||||
set(RDKit_USE_BOOST_COMPONENTS headers)
|
||||
set(RDKit_USE_BOOST_IOSTREAMS @RDK_USE_BOOST_IOSTREAMS@)
|
||||
if (RDKit_USE_BOOST_IOSTREAMS)
|
||||
set(RDKit_USE_BOOST_COMPONENTS ${RDKit_USE_BOOST_COMPONENTS} iostreams)
|
||||
@@ -39,7 +39,7 @@ include(CMakeFindDependencyMacro)
|
||||
|
||||
find_dependency(Threads REQUIRED)
|
||||
|
||||
find_dependency(Boost @Boost_VERSION_STRING@ COMPONENTS headers ${RDKit_USE_BOOST_COMPONENTS})
|
||||
find_dependency(Boost @Boost_VERSION_STRING@ COMPONENTS ${RDKit_USE_BOOST_COMPONENTS})
|
||||
|
||||
if(RDKit_HAS_DESCRIPTORS3D)
|
||||
find_dependency(Eigen3 REQUIRED NO_MODULE)
|
||||
|
||||
Reference in New Issue
Block a user