kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Features: Adjust the RunCMake test to use more-common features.

This commit is contained in:
Stephen Kelly 2015-01-15 23:53:23 +01:00
parent 1f19ac4da5
commit f13a2eb118
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake
View File

@ -3,12 +3,12 @@ add_library(empty1 empty.cpp)
add_library(empty2 INTERFACE) add_library(empty2 INTERFACE)
add_library(empty3 INTERFACE) add_library(empty3 INTERFACE)
target_compile_features(empty3 INTERFACE cxx_constexpr) target_compile_features(empty3 INTERFACE cxx_static_assert)
target_link_libraries(empty1 target_link_libraries(empty1
# When starting, $<COMPILE_FEATURES:cxx_final> is '0', so 'freeze' the # When starting, $<COMPILE_FEATURES:cxx_nullptr> is '0', so 'freeze' the
# CXX_STANDARD at 98 during computation. # CXX_STANDARD at 98 during computation.
$<$<COMPILE_FEATURES:cxx_final>:empty2> $<$<COMPILE_FEATURES:cxx_nullptr>:empty2>
# This would add cxx_constexpr, but that would require CXX_STANDARD = 11, # This would add cxx_constexpr, but that would require CXX_STANDARD = 11,
# which is not allowed after freeze. Report an error. # which is not allowed after freeze. Report an error.
empty3 empty3

6
Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved.cmake
View File

@ -3,12 +3,12 @@ add_library(empty1 empty.cpp)
add_library(empty2 INTERFACE) add_library(empty2 INTERFACE)
add_library(empty3 INTERFACE) add_library(empty3 INTERFACE)
target_compile_features(empty3 INTERFACE cxx_constexpr) target_compile_features(empty3 INTERFACE cxx_static_assert)
target_link_libraries(empty1 target_link_libraries(empty1
$<$<COMPILE_FEATURES:cxx_final>:empty2> $<$<COMPILE_FEATURES:cxx_nullptr>:empty2>
empty3 empty3
) )
# This, or populating the COMPILE_FEATURES property with a feature in the # This, or populating the COMPILE_FEATURES property with a feature in the
# same standard as cxx_final, solves the cycle above. # same standard as cxx_nullptr, solves the cycle above.
set_property(TARGET empty1 PROPERTY CXX_STANDARD 11) set_property(TARGET empty1 PROPERTY CXX_STANDARD 11)