From 12086f634a535be21fa462ff20e40f23189d7019 Mon Sep 17 00:00:00 2001 From: Olivier Stasse <ostasse@laas.fr> Date: Sat, 2 Nov 2019 03:27:41 +0800 Subject: [PATCH] [CMake] Switch to CMake export. --- CMakeLists.txt | 7 +++++-- src/CMakeLists.txt | 4 +++- src/dynamic_graph/CMakeLists.txt | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55d53de..4ff33ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,11 +7,14 @@ SET(PROJECT_NAME dynamic-graph-python) SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings") SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}") +# Export CMake Target +SET(PROJECT_USE_CMAKE_EXPORT TRUE) + INCLUDE(cmake/base.cmake) INCLUDE(cmake/boost.cmake) INCLUDE(cmake/eigen.cmake) -include(cmake/python.cmake) -include(cmake/test.cmake) +INCLUDE(cmake/python.cmake) +INCLUDE(cmake/test.cmake) INCLUDE(cmake/sphinx.cmake) SET(DOXYGEN_USE_MATHJAX YES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 423d969..8313db5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,9 @@ ENDIF(UNIX) SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph) -INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib) +INSTALL(TARGETS ${LIBRARY_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + DESTINATION lib) # # diff --git a/src/dynamic_graph/CMakeLists.txt b/src/dynamic_graph/CMakeLists.txt index c7c8e81..e7ad1ec 100644 --- a/src/dynamic_graph/CMakeLists.txt +++ b/src/dynamic_graph/CMakeLists.txt @@ -23,6 +23,6 @@ TARGET_LINK_LIBRARIES(${PYTHON_MODULE} ${PYTHON_LIBRARY}) SET_TARGET_PROPERTIES(${PYTHON_MODULE} PROPERTIES PREFIX "") -PKG_CONFIG_USE_DEPENDENCY(${PYTHON_MODULE} dynamic-graph) - -INSTALL(TARGETS ${PYTHON_MODULE} DESTINATION ${PYTHON_SITELIB}/dynamic_graph) +INSTALL(TARGETS ${PYTHON_MODULE} + EXPORT ${TARGETS_EXPORT_NAME} + DESTINATION ${PYTHON_SITELIB}/dynamic_graph) -- GitLab