From f1474701f156ccb901314ac79404c658c2afe9a5 Mon Sep 17 00:00:00 2001 From: Bernd Waibel Date: Fri, 21 Feb 2020 19:19:44 +0100 Subject: [PATCH] CMakeLists.txt: find external pybind11 Patch to find system installed pybind11 cmake modules. Signed-off-by: Bernd Waibel --- CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52af1c3..346321e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,23 +278,24 @@ else() endif() if (USE_PYTHON) - add_subdirectory(external_dependencies/pybind11) - find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) - if( PYBIND_INCLUDE_DIR ) - message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}") - else( PYBIND_INCLUDE_DIR ) +# add_subdirectory(external_dependencies/pybind11) +# find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) + find_package(pybind11 CONFIG REQUIRED) + if( pybind11_INCLUDE_DIR ) + message(STATUS "Found Pybind11: ${pybind11_INCLUDE_DIR}") + else( pybind11_INCLUDE_DIR ) message(FATAL_ERROR "Could NOT find pybind11!") - endif( PYBIND_INCLUDE_DIR ) + endif( pybind11_INCLUDE_DIR ) - target_include_directories(netgen_python INTERFACE ${PYBIND_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS}) + target_include_directories(netgen_python INTERFACE ${pybind11_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS}) if(NOT ${BUILD_FOR_CONDA}) # Don't link python libraries in conda environments target_link_libraries(netgen_python INTERFACE ${PYTHON_LIBRARIES}) endif() if(NG_INSTALL_PYBIND) - install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) - install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION ${NG_INSTALL_DIR_INCLUDE}/pybind11 COMPONENT netgen_devel) + install(DIRECTORY ${pybind11_INCLUDE_DIR}/pybind11 DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel) + install(FILES ${pybind11_INCLUDE_DIR}/../LICENSE DESTINATION ${NG_INSTALL_DIR_INCLUDE}/pybind11 COMPONENT netgen_devel) endif(NG_INSTALL_PYBIND) endif (USE_PYTHON) -- 2.25.0