summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-18 13:37:34 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-01-18 13:46:45 (GMT)
commitc66e3317492709ab3b830024f67021dde67a7fe5 (patch)
tree84c2e5664a018c3ee7c91feddbb600be3adb7f45 /Tests
parentc43a6dc5ec2ac57d8334beeabf90de43e8ddb829 (diff)
downloadCMake-c66e3317492709ab3b830024f67021dde67a7fe5.zip
CMake-c66e3317492709ab3b830024f67021dde67a7fe5.tar.gz
CMake-c66e3317492709ab3b830024f67021dde67a7fe5.tar.bz2
Features: Use a more-common feature in cycle-test.
We require that the $<$<COMPILE_FEATURES:cxx_feature>:empty2> generates a '1' when CXX11 is enabled. GNU 4.4 does not support cxx_nullptr, but does support cxx_auto_type.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake
index 684fb2b..09594bd 100644
--- a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake
+++ b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake
@@ -6,9 +6,9 @@ add_library(empty3 INTERFACE)
target_compile_features(empty3 INTERFACE cxx_static_assert)
target_link_libraries(empty1
- # When starting, $<COMPILE_FEATURES:cxx_nullptr> is '0', so 'freeze' the
+ # When starting, $<COMPILE_FEATURES:cxx_auto_type> is '0', so 'freeze' the
# CXX_STANDARD at 98 during computation.
- $<$<COMPILE_FEATURES:cxx_nullptr>:empty2>
+ $<$<COMPILE_FEATURES:cxx_auto_type>:empty2>
# This would add cxx_static_assert, but that would require CXX_STANDARD = 11,
# which is not allowed after freeze. Report an error.
empty3