diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-14 18:35:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-14 18:35:58 (GMT) |
| commit | 0b7e7e277c111d274d7dba378273f77d5b2a4fd7 (patch) | |
| tree | fad6fd6c217b53756df16defa84c4a16cb06d89a /Tests/Module | |
| parent | 2d738ce37acda92b344b1d3f2be2d3b6df63763c (diff) | |
| download | CMake-0b7e7e277c111d274d7dba378273f77d5b2a4fd7.zip CMake-0b7e7e277c111d274d7dba378273f77d5b2a4fd7.tar.gz CMake-0b7e7e277c111d274d7dba378273f77d5b2a4fd7.tar.bz2 | |
Revert topic 'feature_record_msvc'
Revert commits:
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.
This topic was merged to master prematurely, so remove it.
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index cfaa78c..401de95 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES) write_compiler_detection_header( FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h" PREFIX TEST - COMPILERS GNU Clang AppleClang MSVC + COMPILERS GNU Clang AppleClang VERSION 3.1 PROLOG "// something" EPILOG "// more" @@ -64,18 +64,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) endif() -# for msvc the compiler version determines which c++11 features are available. -# Both variadic templates and delegating constructors support exist in -# all versions that we write compile headers for. -if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND - ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;") - list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) - list(APPEND true_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) -else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) - list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) -endif() - if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") @@ -93,7 +81,7 @@ write_compiler_detection_header( PREFIX MULTI OUTPUT_FILES_VAR multi_files OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support" - COMPILERS GNU Clang AppleClang MSVC + COMPILERS GNU Clang AppleClang VERSION 3.1 FEATURES ${cxx_known_features} ${c_known_features} |