diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2015-01-19 20:49:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-30 14:57:33 (GMT) |
| commit | d3489bdb0bc58b36f1e5ff2baa0aee8f4daea734 (patch) | |
| tree | f957e26ba68f2a2f7b38c5b8669954f70c169389 /Modules/WriteCompilerDetectionHeader.cmake | |
| parent | 3228fc5049e72e6d7584a6f3cec6055b8a726817 (diff) | |
| download | CMake-d3489bdb0bc58b36f1e5ff2baa0aee8f4daea734.zip CMake-d3489bdb0bc58b36f1e5ff2baa0aee8f4daea734.tar.gz CMake-d3489bdb0bc58b36f1e5ff2baa0aee8f4daea734.tar.bz2 | |
Features: Record for MSVC 2010-2015
Also, in WCDH add MSVC Compatibility for cxx_align{of,as}.
Co-Author: Stephen Kelly <steveire@gmail.com>
Co-Author: Brad King <brad.king@kitware.com>
Diffstat (limited to 'Modules/WriteCompilerDetectionHeader.cmake')
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index e81bc08..d18f47c 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 +# COMPILERS GNU Clang MSVC # 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 +# COMPILERS GNU Clang AppleClang MSVC # FEATURES cxx_variadic_templates # ) # @@ -321,6 +321,7 @@ function(write_compiler_detection_header GNU Clang AppleClang + MSVC SunPro ) @@ -528,6 +529,8 @@ function(write_compiler_detection_header # define ${def_value} alignas(X) # elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang # define ${def_value} __attribute__ ((__aligned__(X))) +# elif ${prefix_arg}_COMPILER_IS_MSVC +# define ${def_value} __declspec(align(X)) # else # define ${def_value} # endif @@ -540,6 +543,8 @@ function(write_compiler_detection_header # define ${def_value} alignof(X) # elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang # define ${def_value} __alignof__(X) +# elif ${prefix_arg}_COMPILER_IS_MSVC +# define ${def_value} __alignof(X) # endif \n") endif() |