From 8dc50e5294ac1d1c0d580c9b35327b9b47c6f3b2 Mon Sep 17 00:00:00 2001 From: Lars Melchior Date: Fri, 18 Dec 2020 19:36:44 +0100 Subject: [PATCH] use namespaced target (#67) * use namespaced target * update .cmake-format for PackageProject.cmake 1.4 --- .cmake-format | 1 + CMakeLists.txt | 3 ++- standalone/CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cmake-format b/.cmake-format index a52c7d6b..8c355cf9 100644 --- a/.cmake-format +++ b/.cmake-format @@ -48,6 +48,7 @@ parse: kwargs: NAME: 1 VERSION: 1 + NAMESPACE: 1 INCLUDE_DIR: 1 INCLUDE_DESTINATION: 1 BINARY_DIR: 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4efa094b..d12bd851 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ include(cmake/CPM.cmake) CPMAddPackage( NAME PackageProject.cmake GITHUB_REPOSITORY TheLartians/PackageProject.cmake - VERSION 1.3 + VERSION 1.4 ) # ---- Add source files ---- @@ -67,6 +67,7 @@ string(TOLOWER ${PROJECT_NAME}/version.h VERSION_HEADER_LOCATION) packageProject( NAME ${PROJECT_NAME} VERSION ${PROJECT_VERSION} + NAMESPACE ${PROJECT_NAME} BINARY_DIR ${PROJECT_BINARY_DIR} INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION} diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt index 23ff9427..4bb837d7 100644 --- a/standalone/CMakeLists.txt +++ b/standalone/CMakeLists.txt @@ -27,4 +27,4 @@ add_executable(GreeterStandalone ${sources}) set_target_properties(GreeterStandalone PROPERTIES CXX_STANDARD 17 OUTPUT_NAME "Greeter") -target_link_libraries(GreeterStandalone Greeter cxxopts) +target_link_libraries(GreeterStandalone Greeter::Greeter cxxopts) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d62ce82b..302d7f27 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -39,7 +39,7 @@ CPMAddPackage( file(GLOB sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp) add_executable(GreeterTests ${sources}) -target_link_libraries(GreeterTests doctest Greeter) +target_link_libraries(GreeterTests doctest Greeter::Greeter) set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)