[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2761-gfa243d1

[Stephen Kelly]

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  fa243d1f4129bf70cec3ef22f69df2f6e1189375 (commit)
       via  2bfd287ebe1b48f843d1b36742697a14c6286a6b (commit)
      from  9f056934c12d57063642360a987af0977b60f5b6 (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=fa243d1f4129bf70cec3ef22f69df2f6e1189375
commit fa243d1f4129bf70cec3ef22f69df2f6e1189375
Merge: 9f05693 2bfd287
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 5 14:09:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 5 14:09:24 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    2bfd287e Fix static assert compat version.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bfd287ebe1b48f843d1b36742697a14c6286a6b
commit 2bfd287ebe1b48f843d1b36742697a14c6286a6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 5 20:07:34 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 5 20:07:34 2014 +0200

    Fix static assert compat version.

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index acb393c..2b677d9 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -279,12 +279,13 @@ function(write_compiler_detection_header
     foreach(feature ${_WCD_FEATURES})
       get_property(feature_PP GLOBAL PROPERTY CMAKE_PP_NAME_${feature})
       if (feature STREQUAL cxx_static_assert)
-        set(def_name ${prefix_arg}_${CMAKE_PP_NAME_cxx_static_assert})
+        get_property(def_name GLOBAL PROPERTY CMAKE_PP_NAME_cxx_static_assert)
+        set(def_name ${prefix_arg}_${def_name})
         set(def_value "${prefix_arg}_STATIC_ASSERT(X)")
         set(def_value_msg "${prefix_arg}_STATIC_ASSERT_MSG(X, MSG)")
         set(static_assert_struct "template<bool> struct ${prefix_arg}StaticAssert;\ntemplate<> struct ${prefix_arg}StaticAssert<true>{};\n")
         set(def_standard "#    define ${def_value} static_assert(X, #X)\n#    define ${def_value_msg} static_assert(X, MSG)")
-        set(def_alternative "${static_assert_struct}#    define ${def_value} sizeof(CMakeStaticAssert<X>)\n#    define ${def_value_msg} sizeof(CMakeStaticAssert<X>)")
+        set(def_alternative "${static_assert_struct}#    define ${def_value} sizeof(${prefix_arg}StaticAssert<X>)\n#    define ${def_value_msg} sizeof(${prefix_arg}StaticAssert<X>)")
         file(APPEND "${file_arg}" "#  if ${def_name}\n${def_standard}\n#  else\n${def_alternative}\n#  endif\n\n")
       endif()
       if (feature STREQUAL cxx_alignas)

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

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake