diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-23 13:53:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-23 13:53:52 (GMT) |
| commit | 396a008ff0ffed5d4f07f0cb66de5d2523772184 (patch) | |
| tree | 1fb66f58adb0c2e33396537ef61b15551d4ca13c /Modules/WriteCompilerDetectionHeader.cmake | |
| parent | 656af73bca01e4d0834b398685513be2a30c2c7d (diff) | |
| parent | bb83cdaab67196c0ddcc0a0dbbd6f73f2e98938a (diff) | |
| download | CMake-396a008ff0ffed5d4f07f0cb66de5d2523772184.zip CMake-396a008ff0ffed5d4f07f0cb66de5d2523772184.tar.gz CMake-396a008ff0ffed5d4f07f0cb66de5d2523772184.tar.bz2 | |
Merge topic 'AppleClang-5.1-features'
bb83cdaa Help: Add notes for topic 'AppleClang-5.1-features'
bd6b42c1 Features: Record for AppleClang 5.1
b341799e Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 case
Diffstat (limited to 'Modules/WriteCompilerDetectionHeader.cmake')
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index 0b6f0de..36b9706 100644 --- a/Modules/WriteCompilerDetectionHeader.cmake +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -100,7 +100,7 @@ # write_compiler_detection_header( # FILE climbingstats_compiler_detection.h # PREFIX ClimbingStats -# COMPILERS GNU Clang +# COMPILERS GNU Clang AppleClang # FEATURES cxx_variadic_templates # ) # @@ -315,6 +315,7 @@ function(write_compiler_detection_header set(compilers GNU Clang + AppleClang ) set(_hex_compilers ADSP Borland Embarcadero SunPro) @@ -513,7 +514,7 @@ function(write_compiler_detection_header set(file_content "${file_content} # if ${def_name} # define ${def_value} alignas(X) -# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang +# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang # define ${def_value} __attribute__ ((__aligned__(X))) # else # define ${def_value} @@ -525,7 +526,7 @@ function(write_compiler_detection_header set(file_content "${file_content} # if ${def_name} # define ${def_value} alignof(X) -# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang +# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang # define ${def_value} __alignof__(X) # endif \n") |