From c1368caf646f771ebcd27cc65eb87a9c8f110abc Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Tue, 5 Jan 2021 17:56:22 +0100 Subject: [PATCH 1/4] Add namespace fcl to exported CMake targets --- fcl-config.cmake.in | 2 +- src/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fcl-config.cmake.in b/fcl-config.cmake.in index 0bc4fe040..5d95c5cfb 100644 --- a/fcl-config.cmake.in +++ b/fcl-config.cmake.in @@ -6,7 +6,7 @@ set(FCL_VERSION "@FCL_VERSION@") set(FCL_ABI_VERSION "@FCL_ABI_VERSION@") set_and_check(FCL_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -set(FCL_LIBRARIES @PROJECT_NAME@) +set(FCL_LIBRARIES @PROJECT_NAME@::@PROJECT_NAME@) set_and_check(FCL_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@") include(CMakeFindDependencyMacro) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 425724e78..074f1fc61 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,6 +115,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE $) export(TARGETS ${PROJECT_NAME} + NAMESPACE fcl:: FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-targets.cmake" ) @@ -136,6 +137,7 @@ install(TARGETS ${PROJECT_NAME} ) install(EXPORT ${PROJECT_NAME}-targets + NAMESPACE fcl:: DESTINATION ${FCL_INSTALL_CONFIGDIR} COMPONENT Development ) From 710c67cc556a1a5c3696df718a9742745efb3303 Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Tue, 5 Jan 2021 18:54:01 +0100 Subject: [PATCH 2/4] Add imported interface for backwards compatibility --- fcl-config.cmake.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fcl-config.cmake.in b/fcl-config.cmake.in index 5d95c5cfb..0de735a4e 100644 --- a/fcl-config.cmake.in +++ b/fcl-config.cmake.in @@ -17,4 +17,10 @@ include(CMakeFindDependencyMacro) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") +add_library(fcl INTERFACE IMPORTED) +set_target_properties(fcl PROPERTIES INTERFACE_LINK_LIBRARIES "fcl::fcl") +if(NOT CMAKE_VERSION VERSION_LESS 3.17) + set_property(TARGET fcl PROPERTY DEPRECATION "Deprecated target. Please use fcl::fcl instead.") +endif() + check_required_components(@PROJECT_NAME@) From 196ae269e554dc0d86060cf9775329b64ac60277 Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Thu, 7 Jan 2021 13:13:50 +0100 Subject: [PATCH 3/4] Add alias target --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 074f1fc61..7a2e87763 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,6 +47,8 @@ else() add_library(${PROJECT_NAME} SHARED ${FCL_HEADERS} ${FCL_SOURCE_CODE}) endif() +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + # Be sure to pass to the consumer the set of SIMD used in the compilation target_compile_options(${PROJECT_NAME} PUBLIC ${SSE_FLAGS}) From 50a9e82c02e2a3ad76eca0c6f2d39e9b7e7dc2ea Mon Sep 17 00:00:00 2001 From: Markus Rickert Date: Sun, 10 Jan 2021 22:11:33 +0100 Subject: [PATCH 4/4] Use PROJECT_NAME variable --- fcl-config.cmake.in | 6 +++--- src/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fcl-config.cmake.in b/fcl-config.cmake.in index 0de735a4e..0c03ec1d4 100644 --- a/fcl-config.cmake.in +++ b/fcl-config.cmake.in @@ -17,10 +17,10 @@ include(CMakeFindDependencyMacro) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") -add_library(fcl INTERFACE IMPORTED) -set_target_properties(fcl PROPERTIES INTERFACE_LINK_LIBRARIES "fcl::fcl") +add_library(@PROJECT_NAME@ INTERFACE IMPORTED) +set_target_properties(@PROJECT_NAME@ PROPERTIES INTERFACE_LINK_LIBRARIES "@PROJECT_NAME@::@PROJECT_NAME@") if(NOT CMAKE_VERSION VERSION_LESS 3.17) - set_property(TARGET fcl PROPERTY DEPRECATION "Deprecated target. Please use fcl::fcl instead.") + set_property(TARGET @PROJECT_NAME@ PROPERTY DEPRECATION "Deprecated target. Please use @PROJECT_NAME@::@PROJECT_NAME@ instead.") endif() check_required_components(@PROJECT_NAME@) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7a2e87763..c1e7c228b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,7 +117,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE $) export(TARGETS ${PROJECT_NAME} - NAMESPACE fcl:: + NAMESPACE ${PROJECT_NAME}:: FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-targets.cmake" ) @@ -139,7 +139,7 @@ install(TARGETS ${PROJECT_NAME} ) install(EXPORT ${PROJECT_NAME}-targets - NAMESPACE fcl:: + NAMESPACE ${PROJECT_NAME}:: DESTINATION ${FCL_INSTALL_CONFIGDIR} COMPONENT Development )