From d18480879d5e7252ba79e71471dc788f326604bc Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 8 May 2020 11:56:07 +0200 Subject: [PATCH] Linking with Conan targets only when they exists (resolves #98) --- example/CMakeLists.txt | 5 ++++- src/CMakeLists.txt | 6 +++--- test/metabench/CMakeLists.txt | 2 +- test/unit_test/runtime/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 93f23776..e168aac9 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -38,6 +38,9 @@ add_example(kalman_filter-alpha_beta_filter_example2) conan_check_testing(linear_algebra) add_example(linear_algebra) -target_link_libraries(linear_algebra PRIVATE CONAN_PKG::linear_algebra) +target_link_libraries(linear_algebra + PRIVATE + $, CONAN_PKG::linear_algebra, linear_algebra::linear_algebra> +) add_subdirectory(alternative_namespaces) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f8133ea..04b20dc2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,7 +55,7 @@ add_library(units INTERFACE) target_compile_features(units INTERFACE cxx_std_20) target_link_libraries(units INTERFACE - CONAN_PKG::fmt + $, CONAN_PKG::fmt, fmt::fmt> ) target_include_directories(units INTERFACE @@ -65,7 +65,7 @@ target_include_directories(units if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") target_link_libraries(units INTERFACE - CONAN_PKG::range-v3 + $, CONAN_PKG::range-v3, range-v3::range-v3> ) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(units @@ -81,7 +81,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ) target_link_libraries(units INTERFACE - CONAN_PKG::range-v3 + $, CONAN_PKG::range-v3, range-v3::range-v3> ) endif() endif() diff --git a/test/metabench/CMakeLists.txt b/test/metabench/CMakeLists.txt index f54eaba1..0ff2d1ad 100644 --- a/test/metabench/CMakeLists.txt +++ b/test/metabench/CMakeLists.txt @@ -26,7 +26,7 @@ function(add_metabench_test target name erb_path range) target_compile_features(${target} PUBLIC cxx_std_20) target_link_libraries(${target} PUBLIC - CONAN_PKG::range-v3 + $, CONAN_PKG::range-v3, range-v3::range-v3> ) target_compile_options(${target} PUBLIC diff --git a/test/unit_test/runtime/CMakeLists.txt b/test/unit_test/runtime/CMakeLists.txt index 010cd6dc..4f44adee 100644 --- a/test/unit_test/runtime/CMakeLists.txt +++ b/test/unit_test/runtime/CMakeLists.txt @@ -33,7 +33,7 @@ add_executable(unit_tests_runtime target_link_libraries(unit_tests_runtime PRIVATE mp::units - CONAN_PKG::Catch2 + $, CONAN_PKG::Catch2, Catch2::Catch2> ) include(lib/cmake/Catch2/Catch)