diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-11 17:00:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-11 17:00:24 (GMT) |
| commit | 775fb2e0b03772f08b5740ad5463f849109f0c7f (patch) | |
| tree | 8a9a34c31d276fa71affe4d6ddd5507c853cd283 /Tests/RunCMake | |
| parent | 1c0d6a7cb5c51fef3ee8804ed298da95e2c1ca1a (diff) | |
| parent | 2d738ce37acda92b344b1d3f2be2d3b6df63763c (diff) | |
| download | CMake-775fb2e0b03772f08b5740ad5463f849109f0c7f.zip CMake-775fb2e0b03772f08b5740ad5463f849109f0c7f.tar.gz CMake-775fb2e0b03772f08b5740ad5463f849109f0c7f.tar.bz2 | |
Merge topic 'feature_record_msvc'
2d738ce3 Help: Add notes for topic 'feature_record_msvc'
f73718c9 Features: Enable writing of MSVC compiler feature header.
64c30bdc Features: Record for MSVC C++ 2015 and MSVC C 2010-2015.
225c0ef8 Features: Record for MSVC 2010-2013.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 1892a5c..3b37091 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -27,8 +27,13 @@ if (NOT CXX_FEATURES) run_cmake(NoSupportedCxxFeatures) run_cmake(NoSupportedCxxFeaturesGenex) else() - run_cmake(LinkImplementationFeatureCycle) - run_cmake(LinkImplementationFeatureCycleSolved) + # compilers such as MSVC have no explicit flags to enable c++11 mode. + # Instead they come with all c++11 features implicitly enabled. + # So for those types of compilers this tests is not applicable. + if(CMAKE_CXX11_STANDARD_COMPILE_OPTION) + run_cmake(LinkImplementationFeatureCycle) + run_cmake(LinkImplementationFeatureCycleSolved) + endif() if (";${CXX_FEATURES};" MATCHES ";cxx_final;") set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1") |