[Cmake-commits] CMake branch, next, updated. v3.1.0-2262-g49dbd15

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  49dbd156c1c4ea2f7a97a6ba7821cba2595fe37c (commit)
       via  88566c0c4e7d0fd8651794dec4bbdb4506cbdeb3 (commit)
      from  410710a869259e9b0f390f652e4d4dfc51c7ed41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49dbd156c1c4ea2f7a97a6ba7821cba2595fe37c
commit 49dbd156c1c4ea2f7a97a6ba7821cba2595fe37c
Merge: 410710a 88566c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 13:36:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 13:36:01 2015 -0500

    Merge topic 'feature-record-msvc' into next
    
    88566c0c WCDH: MSVC Compatibility for cxx_align{of,as}


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88566c0c4e7d0fd8651794dec4bbdb4506cbdeb3
commit 88566c0c4e7d0fd8651794dec4bbdb4506cbdeb3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 15:55:37 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 20 13:34:42 2015 -0500

    WCDH: MSVC Compatibility for cxx_align{of,as}

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index 5642c99..d18f47c 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -529,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
@@ -541,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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake