Fixes #2516 (#2519)

* RDStreams now installed properly * skip Wrap directories if RDK_BUILD_PYTHON_WRAPPERS is not set Fixes #2516
2026-06-03 21:44:30 +08:00 · 2019-06-28 15:57:00 +02:00
parent b0268d4631
commit 7e6600f3be
41 changed files with 83 additions and 6 deletions
--- a/Code/ChemicalFeatures/CMakeLists.txt
+++ b/Code/ChemicalFeatures/CMakeLists.txt
@@ -9,7 +9,8 @@ rdkit_headers(ChemicalFeature.h
 rdkit_test(testChemicalFeatures testChemicalFeatures.cpp 
           LINK_LIBRARIES ChemicalFeatures RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
-
+endif()


--- a/Code/DataManip/MetricMatrixCalc/CMakeLists.txt
+++ b/Code/DataManip/MetricMatrixCalc/CMakeLists.txt
@@ -4,7 +4,8 @@ rdkit_headers(MetricFuncs.h

 rdkit_test(testMatCalc testMatCalc.cpp LINK_LIBRARIES RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
-
+endif()


--- a/Code/DataStructs/CMakeLists.txt
+++ b/Code/DataStructs/CMakeLists.txt
@@ -35,4 +35,6 @@ rdkit_test(testFPB testFPB.cpp
 rdkit_test(testMultiFPB testMultiFPB.cpp
           LINK_LIBRARIES DataStructs RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/DistGeom/CMakeLists.txt
+++ b/Code/DistGeom/CMakeLists.txt
@@ -18,4 +18,6 @@ rdkit_headers(BoundsMatrix.h
 rdkit_test(testDistGeom testDistGeom.cpp 
 LINK_LIBRARIES DistGeometry EigenSolvers ForceField ForceFieldHelpers Optimizer RDGeneral RDGeometryLib )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/ForceField/CMakeLists.txt
+++ b/Code/ForceField/CMakeLists.txt
@@ -44,4 +44,6 @@ rdkit_headers(MMFF/AngleBend.h

 add_subdirectory(UFF)
 add_subdirectory(MMFF)
+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/Geometry/CMakeLists.txt
+++ b/Code/Geometry/CMakeLists.txt
@@ -17,4 +17,6 @@ rdkit_headers(Grid3D.h
 rdkit_test(testTransforms testTransforms.cpp LINK_LIBRARIES RDGeometryLib DataStructs RDGeneral )
 rdkit_test(testGrid testGrid.cpp LINK_LIBRARIES RDGeometryLib DataStructs RDGeneral )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/CMakeLists.txt
+++ b/Code/GraphMol/CMakeLists.txt
@@ -96,7 +96,9 @@ if(RDK_BUILD_SLN_SUPPORT AND NOT CMAKE_COMPILER_IS_CLANG)
  endif()
 endif()

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 add_subdirectory(MolStandardize)

--- a/Code/GraphMol/ChemReactions/CMakeLists.txt
+++ b/Code/GraphMol/ChemReactions/CMakeLists.txt
@@ -60,4 +60,6 @@ rdkit_catch_test(rxnTestCatch catch_tests.cpp LINK_LIBRARIES ChemReactions ChemT
 Subgraphs DataStructs  FileParsers SmilesParse SubstructMatch
 GraphMol RDGeneral RDGeometryLib ${RDKit_SERIALIZATION_LIBS} )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/Depictor/CMakeLists.txt
+++ b/Code/GraphMol/Depictor/CMakeLists.txt
@@ -30,4 +30,6 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
        "${extra_clean_files};${TEST_OUTPUT_FILES}")


+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/Descriptors/CMakeLists.txt
+++ b/Code/GraphMol/Descriptors/CMakeLists.txt
@@ -58,4 +58,6 @@ LINK_LIBRARIES  Descriptors FileParsers SmilesParse MolTransforms PartialCharges
 endif(RDK_BUILD_DESCRIPTORS3D)


+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/DistGeomHelpers/CMakeLists.txt
+++ b/Code/GraphMol/DistGeomHelpers/CMakeLists.txt
@@ -13,4 +13,6 @@ rdkit_test(testDistGeomHelpers testDgeomHelpers.cpp
           DistGeomHelpers DistGeometry ForceFieldHelpers ForceField
 	   MolAlign MolTransforms  FileParsers SmilesParse SubstructMatch Optimizer EigenSolvers Alignment GraphMol RDGeometryLib RDGeneral ${RDKit_THREAD_LIBS} )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/FMCS/CMakeLists.txt
+++ b/Code/GraphMol/FMCS/CMakeLists.txt
@@ -20,5 +20,7 @@ rdkit_test(testFMCS testFMCS_Unit.cpp LINK_LIBRARIES
 FMCS ChemTransforms Depictor FileParsers SmilesParse 
 GraphMol RDGeneral RDGeometryLib SubstructMatch  ${RDKit_THREAD_LIBS})

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
 add_subdirectory(Test)
--- a/Code/GraphMol/FilterCatalog/CMakeLists.txt
+++ b/Code/GraphMol/FilterCatalog/CMakeLists.txt
@@ -40,7 +40,9 @@ rdkit_headers(FilterCatalogEntry.h
              FunctionalGroupHierarchy.h
              DEST GraphMol/FilterCatalog)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 rdkit_test(filterCatalogTest filtercatalogtest.cpp
           LINK_LIBRARIES FilterCatalog
--- a/Code/GraphMol/Fingerprints/CMakeLists.txt
+++ b/Code/GraphMol/Fingerprints/CMakeLists.txt
@@ -32,4 +32,6 @@ rdkit_test(testFingerprintGenerators testFingerprintGenerators.cpp LINK_LIBRARIE
 rdkit_catch_test(fpTestCatch catch_tests.cpp LINK_LIBRARIES Fingerprints SmilesParse GraphMol DataStructs FileParsers
           RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/ForceFieldHelpers/CMakeLists.txt
+++ b/Code/GraphMol/ForceFieldHelpers/CMakeLists.txt
@@ -17,4 +17,6 @@ rdkit_headers(CrystalFF/TorsionAngleM6.h CrystalFF/TorsionPreferences.h
 add_subdirectory(MMFF)
 add_subdirectory(UFF)
 add_subdirectory(CrystalFF)
+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/FragCatalog/CMakeLists.txt
+++ b/Code/GraphMol/FragCatalog/CMakeLists.txt
@@ -14,5 +14,6 @@ rdkit_headers(FragCatalogEntry.h

 rdkit_test(testFragCatalog test1.cpp LINK_LIBRARIES FragCatalog Subgraphs SubstructMatch SmilesParse Catalogs FileParsers GraphMol DataStructs RDGeometryLib RDGeneral  )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
-
+endif()
--- a/Code/GraphMol/MMPA/CMakeLists.txt
+++ b/Code/GraphMol/MMPA/CMakeLists.txt
@@ -17,4 +17,6 @@ rdkit_test(testMMPA MMPA_UnitTest.cpp LINK_LIBRARIES
  GraphMol RDGeneral RDGeometryLib SubstructMatch  ${RDKit_THREAD_LIBS})


+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/MolAlign/CMakeLists.txt
+++ b/Code/GraphMol/MolAlign/CMakeLists.txt
@@ -12,4 +12,6 @@ FileParsers DistGeomHelpers ForceFieldHelpers
 SmilesParse DistGeometry ForceField Optimizer SubstructMatch
 GraphMol RDGeneral RDGeometryLib ${RDKit_THREAD_LIBS})

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/MolCatalog/CMakeLists.txt
+++ b/Code/GraphMol/MolCatalog/CMakeLists.txt
@@ -11,7 +11,9 @@ rdkit_headers(MolCatalogEntry.h
 rdkit_test(testMolCatalog test1.cpp LINK_LIBRARIES 
 MolCatalog FileParsers Catalogs SmilesParse GraphMol DataStructs RDGeneral RDGeometryLib )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()



--- a/Code/GraphMol/MolChemicalFeatures/CMakeLists.txt
+++ b/Code/GraphMol/MolChemicalFeatures/CMakeLists.txt
@@ -17,5 +17,7 @@ FileParsers SmilesParse SubstructMatch DataStructs
 GraphMol RDGeometryLib RDGeneral
 )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

--- a/Code/GraphMol/MolDraw2D/CMakeLists.txt
+++ b/Code/GraphMol/MolDraw2D/CMakeLists.txt
@@ -62,4 +62,6 @@ if(RDK_BUILD_QT_DEMO)
  add_subdirectory(QTDemo)
 endif(RDK_BUILD_QT_DEMO)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/MolHash/CMakeLists.txt
+++ b/Code/GraphMol/MolHash/CMakeLists.txt
@@ -11,5 +11,7 @@ rdkit_headers(MolHash.h
 rdkit_test(testMolHash testMolHash.cpp 
 LINK_LIBRARIES MolHash GraphMol ChemTransforms Depictor Descriptors FileParsers SmilesParse RDGeneral RDGeometryLib)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

--- a/Code/GraphMol/MolInterchange/CMakeLists.txt
+++ b/Code/GraphMol/MolInterchange/CMakeLists.txt
@@ -25,4 +25,6 @@ rdkit_headers(MolInterchange.h details.h
 rdkit_test(molInterchangeTest1 test1.cpp
           LINK_LIBRARIES MolInterchange FileParsers SmilesParse GraphMol RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/MolStandardize/CMakeLists.txt
+++ b/Code/GraphMol/MolStandardize/CMakeLists.txt
@@ -44,7 +44,9 @@ rdkit_headers(MolStandardize.h
        TautomerCatalog/TautomerCatalogUtils.h
 	      DEST GraphMol/MolStandardize)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 rdkit_test(molStandardizeTest test1.cpp LINK_LIBRARIES MolStandardize
 	SmilesParse RDGeneral GraphMol SubstructMatch )
--- a/Code/GraphMol/MolTransforms/CMakeLists.txt
+++ b/Code/GraphMol/MolTransforms/CMakeLists.txt
@@ -12,4 +12,6 @@ rdkit_test(testMolTransforms test1.cpp
           FileParsers SmilesParse
 	   EigenSolvers GraphMol RDGeometryLib RDGeneral )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/PartialCharges/CMakeLists.txt
+++ b/Code/GraphMol/PartialCharges/CMakeLists.txt
@@ -12,4 +12,6 @@ rdkit_test(testPartialCharges test1.cpp LINK_LIBRARIES  PartialCharges
 SmilesParse GraphMol RDGeometryLib RDGeneral DataStructs 
 ${RDKit_THREAD_LIBS} )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/RGroupDecomposition/CMakeLists.txt
+++ b/Code/GraphMol/RGroupDecomposition/CMakeLists.txt
@@ -11,7 +11,9 @@ rdkit_headers(
   DEST GraphMol/RGroupDecomposition)


+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()


 rdkit_test(testRGroupDecomp testRGroupDecomp.cpp 
--- a/Code/GraphMol/ReducedGraphs/CMakeLists.txt
+++ b/Code/GraphMol/ReducedGraphs/CMakeLists.txt
@@ -15,5 +15,7 @@ rdkit_test(testReducedGraphs test1.cpp LINK_LIBRARIES
           GraphMol DataStructs RDGeometryLib
           RDGeneral  )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

--- a/Code/GraphMol/SLNParse/CMakeLists.txt
+++ b/Code/GraphMol/SLNParse/CMakeLists.txt
@@ -55,4 +55,6 @@ rdkit_test(testSLNParse test.cpp
 GraphMol RDGeometryLib RDGeneral
 )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/GraphMol/ShapeHelpers/CMakeLists.txt
+++ b/Code/GraphMol/ShapeHelpers/CMakeLists.txt
@@ -12,5 +12,7 @@ rdkit_test(testShapeHelpers testShapeHelpers.cpp
 SmilesParse FileParsers MolTransforms SubstructMatch EigenSolvers Alignment DataStructs
 GraphMol RDGeneral RDGeometryLib )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

--- a/Code/GraphMol/StructChecker/CMakeLists.txt
+++ b/Code/GraphMol/StructChecker/CMakeLists.txt
@@ -10,7 +10,9 @@ rdkit_library(StructChecker
 rdkit_headers(StructChecker.h Utilites.h Pattern.h Stereo.h StripSmallFragments.h ReCharge.h Tautomer.h
              DEST GraphMol/StructChecker)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 rdkit_test(testStructChecker  testStructChecker.cpp 
           LINK_LIBRARIES StructChecker ChemTransforms Depictor Descriptors
--- a/Code/GraphMol/SubstructLibrary/CMakeLists.txt
+++ b/Code/GraphMol/SubstructLibrary/CMakeLists.txt
@@ -24,7 +24,9 @@ rdkit_headers(SubstructLibrary.h
              SubstructLibrarySerialization.h
              DEST GraphMol/SubstructLibrary)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 rdkit_test(substructLibraryTest substructLibraryTest.cpp
           LINK_LIBRARIES SubstructLibrary Fingerprints
--- a/Code/ML/InfoTheory/CMakeLists.txt
+++ b/Code/ML/InfoTheory/CMakeLists.txt
@@ -2,4 +2,6 @@
 add_definitions(-DRDKIT_INFOTHEORY_BUILD)
 rdkit_library(InfoTheory InfoBitRanker.cpp LINK_LIBRARIES DataStructs RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/Numerics/Alignment/CMakeLists.txt
+++ b/Code/Numerics/Alignment/CMakeLists.txt
@@ -6,4 +6,6 @@ rdkit_headers(AlignPoints.h DEST Numerics/Alignment)

 rdkit_test(testAlignment testAlignment.cpp LINK_LIBRARIES Alignment RDGeometryLib RDGeneral )

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Code/RDBoost/CMakeLists.txt
+++ b/Code/RDBoost/CMakeLists.txt
@@ -23,7 +23,9 @@ rdkit_headers(Wrap.h PySequenceHolder.h
              python_streambuf.h
              DEST RDBoost)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 if(RDK_BUILD_PYTHON_WRAPPERS)
  # this is a particularly nasty little bit of hackery.
--- a/Code/RDStreams/CMakeLists.txt
+++ b/Code/RDStreams/CMakeLists.txt
@@ -24,5 +24,5 @@ endif()
 add_definitions(-DRDKIT_RDSTREAMS_BUILD)
 endif(RDK_USE_BOOST_IOSTREAMS)
 rdkit_library(RDStreams streams.cpp
-              LINK_LIBRARIES ${Boost_LIBRARIES} ${link_iostreams} ${zlib_lib}
-              DEST RDStreams)
+              LINK_LIBRARIES ${Boost_LIBRARIES} ${link_iostreams} ${zlib_lib})
+rdkit_headers(streams.h DEST RDStreams)
--- a/Code/SimDivPickers/CMakeLists.txt
+++ b/Code/SimDivPickers/CMakeLists.txt
@@ -10,4 +10,6 @@ rdkit_headers(DistPicker.h

 rdkit_test(testSimDivPickers testPickers.cpp LINK_LIBRARIES SimDivPickers RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()
--- a/Contrib/ConformerParser/CMakeLists.txt
+++ b/Contrib/ConformerParser/CMakeLists.txt
@@ -6,4 +6,6 @@ rdkit_test(testConformerParser test.cpp
 FileParsers SmilesParse
 GraphMol RDGeometryLib RDGeneral)

-add_subdirectory(Wrap)
+if(RDK_BUILD_PYTHON_WRAPPERS)
+add_subdirectory(Wrap)
+endif()
--- a/External/AvalonTools/CMakeLists.txt
+++ b/External/AvalonTools/CMakeLists.txt
@@ -101,6 +101,8 @@ rdkit_test(testAvalonLib1 test1.cpp
 	   SubstructMatch
 	   FileParsers SmilesParse GraphMol DataStructs RDGeometryLib RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 endif(RDK_BUILD_AVALON_SUPPORT)
--- a/External/FreeSASA/CMakeLists.txt
+++ b/External/FreeSASA/CMakeLists.txt
@@ -97,6 +97,8 @@ rdkit_test(testFreeSASALib testFreeSASA.cpp
           LINK_LIBRARIES FreeSASALib freesasa_clib FileParsers SmilesParse
                          GraphMol DataStructs RDGeometryLib RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 endif(RDK_BUILD_FREESASA_SUPPORT)
--- a/External/YAeHMOP/CMakeLists.txt
+++ b/External/YAeHMOP/CMakeLists.txt
@@ -46,6 +46,8 @@ rdkit_catch_test(testEHTLib1 test1.cpp
           LINK_LIBRARIES EHTLib yaehmop_eht 
 	   FileParsers SmilesParse GraphMol DataStructs RDGeometryLib RDGeneral)

+if(RDK_BUILD_PYTHON_WRAPPERS)
 add_subdirectory(Wrap)
+endif()

 endif(RDK_BUILD_YAEHMOP_SUPPORT)