From 6046bb2d034851dff1d80da6de8d911e686dadcd Mon Sep 17 00:00:00 2001 From: Paolo Tosco Date: Sun, 7 Apr 2019 10:38:26 +0100 Subject: [PATCH] - avoid a build failure on Windows (#2399) * - avoid a build failure on Windows * - fix compilation error when building compressed suppliers * - fix accidental commit * - proper fix --- Code/GraphMol/Trajectory/CMakeLists.txt | 2 +- Code/GraphMol/Wrap/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Code/GraphMol/Trajectory/CMakeLists.txt b/Code/GraphMol/Trajectory/CMakeLists.txt index c5f7ac37e..b5b37e522 100644 --- a/Code/GraphMol/Trajectory/CMakeLists.txt +++ b/Code/GraphMol/Trajectory/CMakeLists.txt @@ -7,6 +7,6 @@ rdkit_library(Trajectory Trajectory.cpp rdkit_headers(Snapshot.h Trajectory.h DEST GraphMol/Trajectory) rdkit_test(trajectoryTest trajectoryTest.cpp - LINK_LIBRARIES Trajectory RDGeneral RDGeometryLib + LINK_LIBRARIES Trajectory RDGeneral RDGeometryLib GraphMol FileParsers SmilesParse SubstructMatch ForceFieldHelpers ForceField) diff --git a/Code/GraphMol/Wrap/CMakeLists.txt b/Code/GraphMol/Wrap/CMakeLists.txt index 6ac976f36..e8487ad5d 100644 --- a/Code/GraphMol/Wrap/CMakeLists.txt +++ b/Code/GraphMol/Wrap/CMakeLists.txt @@ -29,6 +29,9 @@ endif() if(RDK_BUILD_COMPRESSED_SUPPLIERS) find_package(Boost 1.56.0 COMPONENTS iostreams REQUIRED) +if (NOT Boost_USE_STATIC_LIBS) + add_definitions("-DBOOST_IOSTREAMS_DYN_LINK") +endif() set(rdmolfiles_sources rdmolfiles.cpp ForwardSDMolSupplier.cpp ${maesupplier} SDMolSupplier.cpp TDTMolSupplier.cpp @@ -54,7 +57,7 @@ rdkit_python_extension(rdmolfiles rdkit_python_extension(rdtrajectory Trajectory.cpp rdTrajectory.cpp DEST Chem - LINK_LIBRARIES Trajectory RDGeometryLib RDGeneral GraphMol) + LINK_LIBRARIES Trajectory RDGeometryLib RDGeneral RDBoost GraphMol) if(RDK_BUILD_COMPRESSED_SUPPLIERS) set_target_properties(rdmolfiles PROPERTIES DEFINE_SYMBOL SUPPORT_COMPRESSED_SUPPLIERS )