diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-19 18:55:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-19 18:55:31 (GMT) |
| commit | 813ace90e4d02a782176ea13bcec15a3e9338210 (patch) | |
| tree | 54198b83854486eeec7fee7fcf543e7641874adf /Tests/RunCMake | |
| parent | 137a15bf1da72c795d8eeded4ad3848a5692dce6 (diff) | |
| parent | 004e1540e0870e9b3bde19ad16c4f50b7d22df73 (diff) | |
| download | CMake-813ace90e4d02a782176ea13bcec15a3e9338210.zip CMake-813ace90e4d02a782176ea13bcec15a3e9338210.tar.gz CMake-813ace90e4d02a782176ea13bcec15a3e9338210.tar.bz2 | |
Merge topic 'GNU-4.4-compile-features'
004e1540 Features: Record for GNU 4.4.
2a5ca650 Features: Wrap failure-test in UNIX condition.
1ae2c6b2 Features: Blacklist cxx_constexpr test for GNU 4.5.
c66e3317 Features: Use a more-common feature in cycle-test.
c43a6dc5 Features: Update comment in test to match the code.
78259135 Features: Test presence of cxx_auto_type with genex.
7b9fc88b Features: Remove outdated comment.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake index d2c95ec..09594bd 100644 --- a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake +++ b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycle.cmake @@ -6,10 +6,10 @@ 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> - # This would add cxx_constexpr, but that would require CXX_STANDARD = 11, + $<$<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 ) |