From 75ccca6fea24d5e37cb5f0a4904594a8e554070d Mon Sep 17 00:00:00 2001 From: dengjun Date: Sun, 31 Jan 2021 20:17:46 +0800 Subject: [PATCH 1/2] fix cmake targets --- CMakeLists.txt | 13 +++++++++++++ workflow-config.cmake.in | 2 ++ 2 files changed, 15 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f324b2b1..44093e9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,3 +112,16 @@ install( DESTINATION "${CMAKE_INSTALL_DOCDIR}-${PROJECT_VERSION}" COMPONENT devel ) + +install ( + TARGETS ${CMAKE_PROJECT_NAME} EXPORT ${CMAKE_PROJECT_NAME}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +install ( + EXPORT ${CMAKE_PROJECT_NAME}-targets + FILE ${CMAKE_PROJECT_NAME}-targets.cmake + DESTINATION "${CMAKE_CONFIG_INSTALL_DIR}" +) \ No newline at end of file diff --git a/workflow-config.cmake.in b/workflow-config.cmake.in index e46707e0..c57fbc8f 100644 --- a/workflow-config.cmake.in +++ b/workflow-config.cmake.in @@ -4,5 +4,7 @@ set(WORKFLOW_VERSION "@workflow_VERSION@") set_and_check(WORKFLOW_INCLUDE_DIR "@PACKAGE_CONFIG_INC_DIR@") set_and_check(WORKFLOW_LIB_DIR "@PACKAGE_CONFIG_LIB_DIR@") +include ("${CMAKE_CURRENT_LIST_DIR}/workflow-targets.cmake") + check_required_components(workflow) From 5650bbf2644e2b6bdde073054d1a8c7be6c1f0fa Mon Sep 17 00:00:00 2001 From: dengjunplusplus Date: Mon, 8 Feb 2021 16:20:33 +0800 Subject: [PATCH 2/2] fix ci build error. cmake 3.9 require install targets in the CMakelists.txt which contains add_library or add executable --- CMakeLists.txt | 13 ------------- src/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44093e9f..f2fc16d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,17 +111,4 @@ install( FILES README.md DESTINATION "${CMAKE_INSTALL_DOCDIR}-${PROJECT_VERSION}" COMPONENT devel -) - -install ( - TARGETS ${CMAKE_PROJECT_NAME} EXPORT ${CMAKE_PROJECT_NAME}-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) - -install ( - EXPORT ${CMAKE_PROJECT_NAME}-targets - FILE ${CMAKE_PROJECT_NAME}-targets.cmake - DESTINATION "${CMAKE_CONFIG_INSTALL_DIR}" ) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1e7f07f6..399337fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -65,3 +65,15 @@ install( COMPONENT devel ) +install ( + TARGETS ${CMAKE_PROJECT_NAME} EXPORT ${CMAKE_PROJECT_NAME}-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +install ( + EXPORT ${CMAKE_PROJECT_NAME}-targets + FILE ${CMAKE_PROJECT_NAME}-targets.cmake + DESTINATION "${CMAKE_CONFIG_INSTALL_DIR}" +)