mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert topic 'feature_record_msvc'

Browse Source 
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.
This commit is contained in:
Brad King
2015-01-14 13:35:53 -05:00
parent 2d738ce37a
commit 0b7e7e277c
10 changed files with 7 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+2 -14
View File
@@ -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}