diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2016-04-14 12:57:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-28 13:16:36 (GMT) |
| commit | 15a6c9502d6916274af2c634593295cf81af8af6 (patch) | |
| tree | 33a05d2a2d9bb7a829e797f70983624f52eeee81 | |
| parent | 36f32ede8d1a2aa1578a726f687a24dec4cc3f33 (diff) | |
| download | CMake-15a6c9502d6916274af2c634593295cf81af8af6.zip CMake-15a6c9502d6916274af2c634593295cf81af8af6.tar.gz CMake-15a6c9502d6916274af2c634593295cf81af8af6.tar.bz2 | |
WCDH: Add Intel to list of supported compilers
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 5 | ||||
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index a3b73bb..2669a84 100644 --- a/Modules/WriteCompilerDetectionHeader.cmake +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -36,7 +36,7 @@ # PREFIX ClimbingStats # OUTPUT_FILES_VAR support_files # OUTPUT_DIR compilers -# COMPILERS GNU Clang MSVC +# COMPILERS GNU Clang MSVC Intel # FEATURES cxx_variadic_templates # ) # install(FILES @@ -100,7 +100,7 @@ # write_compiler_detection_header( # FILE climbingstats_compiler_detection.h # PREFIX ClimbingStats -# COMPILERS GNU Clang AppleClang MSVC +# COMPILERS GNU Clang AppleClang MSVC Intel # FEATURES cxx_variadic_templates # ) # @@ -323,6 +323,7 @@ function(write_compiler_detection_header AppleClang MSVC SunPro + Intel ) set(_hex_compilers ADSP Borland Embarcadero SunPro) diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index c538280..8b251d7 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 SunPro + COMPILERS GNU Clang AppleClang MSVC SunPro Intel VERSION 3.1 PROLOG "// something" EPILOG "// more" @@ -61,7 +61,8 @@ endmacro() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" - OR CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") + OR CMAKE_CXX_COMPILER_ID STREQUAL "SunPro" + OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel") # False for C++98 mode. list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) @@ -80,7 +81,9 @@ endif() if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang" - OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" + OR CMAKE_C_COMPILER_ID STREQUAL "Intel") + add_executable(C_undefined c_undefined.c) set_property(TARGET C_undefined PROPERTY C_STANDARD 90) target_compile_options(C_undefined PRIVATE -Werror=undef) @@ -104,7 +107,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 SunPro + COMPILERS GNU Clang AppleClang MSVC SunPro Intel VERSION 3.1 FEATURES ${cxx_known_features} ${c_known_features} @@ -142,7 +145,8 @@ set_defines(multi_files_11 "${true_defs}" "${false_defs}") if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang" - OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang" + OR CMAKE_C_COMPILER_ID STREQUAL "Intel") add_executable(WriteCompilerDetectionHeader_C11 main.c) set_property(TARGET WriteCompilerDetectionHeader_C11 PROPERTY C_STANDARD 11) set_defines(WriteCompilerDetectionHeader_C11 "EXPECTED_COMPILER_C_FUNCTION_PROTOTYPES;EXPECTED_COMPILER_C_RESTRICT" "") |