rdkit-targets.cmake now uses cmake package names for external libraries instead of absolute paths (#8552)

This commit is contained in:
Kevin Keating
2025-05-24 01:27:03 -04:00
committed by GitHub
parent f3cd17ba37
commit 2a6307b0aa
7 changed files with 23 additions and 78 deletions

View File

@@ -6,7 +6,7 @@ if(RDK_BUILD_MAEPARSER_SUPPORT OR RDK_BUILD_COORDGEN_SUPPORT)
add_definitions(-DIN_MAEPARSER)
endif()
find_package(maeparser MODULE QUIET)
find_package(maeparser QUIET)
if(MAEPARSER_FORCE_BUILD OR (NOT maeparser_FOUND))
if(NOT DEFINED MAEPARSER_DIR)
@@ -61,7 +61,7 @@ if(RDK_BUILD_COORDGEN_SUPPORT)
add_definitions(-DIN_COORDGEN)
endif(MSVC AND (NOT RDK_INSTALL_DLLS_MSVC))
find_package(coordgen MODULE QUIET)
find_package(coordgen QUIET)
if(COORDGEN_FORCE_BUILD OR (NOT coordgen_FOUND))
if(NOT DEFINED COORDGEN_DIR)
set(COORDGEN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/coordgen")
@@ -110,7 +110,7 @@ if(RDK_BUILD_COORDGEN_SUPPORT)
rdkit_test(testCoordGen test.cpp
LINK_LIBRARIES
"${RDK_COORDGEN_LIBS}" Depictor ChemTransforms
coordgen Depictor ChemTransforms
FileParsers SmilesParse SubstructMatch GraphMol
RDGeneral DataStructs RDGeneral RDGeometryLib
${RDKit_THREAD_LIBS})

View File

@@ -2,6 +2,6 @@ rdkit_python_extension(rdCoordGen
rdCoordGen.cpp
DEST Chem
LINK_LIBRARIES
${RDK_COORDGEN_LIBS} MolAlign SubstructMatch GraphMol DataStructs RDGeometryLib RDGeneral RDBoost)
coordgen MolAlign SubstructMatch GraphMol DataStructs RDGeometryLib RDGeneral RDBoost)
add_pytest(pyCoordGen
${CMAKE_CURRENT_SOURCE_DIR}/testCoordGen.py)