mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 20:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Errors in CMake generator expressions fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2020-05-08 17:50:28 +02:00
parent 3eb40043dc
commit 68405ef7f6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/CMakeLists.txt
View File

@@ -40,7 +40,7 @@ conan_check_testing(linear_algebra)
add_example(linear_algebra) add_example(linear_algebra)
target_link_libraries(linear_algebra target_link_libraries(linear_algebra
PRIVATE PRIVATE
$<IF:$<TARGET_EXISTS:CONAN_PKG::linear_algebra>, CONAN_PKG::linear_algebra, linear_algebra::linear_algebra> $<IF:$<TARGET_EXISTS:CONAN_PKG::linear_algebra>,CONAN_PKG::linear_algebra,linear_algebra::linear_algebra>
) )
add_subdirectory(alternative_namespaces) add_subdirectory(alternative_namespaces)

6
src/CMakeLists.txt
View File

@@ -55,7 +55,7 @@ add_library(units INTERFACE)
target_compile_features(units INTERFACE cxx_std_20) target_compile_features(units INTERFACE cxx_std_20)
target_link_libraries(units target_link_libraries(units
INTERFACE INTERFACE
$<IF:$<TARGET_EXISTS:CONAN_PKG::fmt>, CONAN_PKG::fmt, fmt::fmt> $<IF:$<TARGET_EXISTS:CONAN_PKG::fmt>,CONAN_PKG::fmt,fmt::fmt>
) )
target_include_directories(units target_include_directories(units
INTERFACE INTERFACE
@@ -65,7 +65,7 @@ target_include_directories(units
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_link_libraries(units target_link_libraries(units
INTERFACE INTERFACE
$<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>, CONAN_PKG::range-v3, range-v3::range-v3> $<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>,CONAN_PKG::range-v3,range-v3::range-v3>
) )
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(units target_compile_options(units
@@ -81,7 +81,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
) )
target_link_libraries(units target_link_libraries(units
INTERFACE INTERFACE
$<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>, CONAN_PKG::range-v3, range-v3::range-v3> $<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>,CONAN_PKG::range-v3,range-v3::range-v3>
) )
endif() endif()
endif() endif()

2
test/metabench/CMakeLists.txt
View File

@@ -26,7 +26,7 @@ function(add_metabench_test target name erb_path range)
target_compile_features(${target} PUBLIC cxx_std_20) target_compile_features(${target} PUBLIC cxx_std_20)
target_link_libraries(${target} target_link_libraries(${target}
PUBLIC PUBLIC
$<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>, CONAN_PKG::range-v3, range-v3::range-v3> $<IF:$<TARGET_EXISTS:CONAN_PKG::range-v3>,CONAN_PKG::range-v3,range-v3::range-v3>
) )
target_compile_options(${target} target_compile_options(${target}
PUBLIC PUBLIC

2
test/unit_test/runtime/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ add_executable(unit_tests_runtime
target_link_libraries(unit_tests_runtime target_link_libraries(unit_tests_runtime
PRIVATE PRIVATE
mp::units mp::units
$<IF:$<TARGET_EXISTS:CONAN_PKG::Catch2>, CONAN_PKG::Catch2, Catch2::Catch2> $<IF:$<TARGET_EXISTS:CONAN_PKG::Catch2>,CONAN_PKG::Catch2,Catch2::Catch2>
) )
include(lib/cmake/Catch2/Catch) include(lib/cmake/Catch2/Catch)