- 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
This commit is contained in:
Paolo Tosco
2019-04-07 10:38:26 +01:00
committed by Greg Landrum
parent 09325d32ff
commit 6046bb2d03
2 changed files with 5 additions and 2 deletions

View File

@@ -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)

View File

@@ -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 )