[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4270-g45bb6fa

[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  45bb6fa409c8165d4b0e3153203d87bab5152731 (commit)
       via  cdf55d5cb4c03a29c21b5eae8ac5c59d244b9b45 (commit)
       via  80d5090a2c084c1b14a4cafce14d8ca9fec8a6c9 (commit)
      from  fb9821f70dd959c377458ac15a0f9a8e35321c73 (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=45bb6fa409c8165d4b0e3153203d87bab5152731
commit 45bb6fa409c8165d4b0e3153203d87bab5152731
Merge: fb9821f cdf55d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 23 02:04:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 23 02:04:45 2013 -0400

    Merge topic 'deprecation-macro-refactor' into next
    
    cdf55d5 GEH: Make each element of the deprecation macros overridable.
    80d5090 GEH: Use the macro for the deprecation attribute after definiting it.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdf55d5cb4c03a29c21b5eae8ac5c59d244b9b45
commit cdf55d5cb4c03a29c21b5eae8ac5c59d244b9b45
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 23 07:44:37 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Sep 23 08:04:16 2013 +0200

    GEH: Make each element of the deprecation macros overridable.
    
    This way, we can override only FOO_DEPRECATED to silence deprecation
    for a library.

diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in
index 4fe589d..118de16 100644
--- a/Modules/exportheader.cmake.in
+++ b/Modules/exportheader.cmake.in
@@ -23,7 +23,13 @@
 
 #ifndef @DEPRECATED_MACRO_NAME@
 #  define @DEPRECATED_MACRO_NAME@ @DEFINE_DEPRECATED@
+#endif
+
+#ifndef @DEPRECATED_MACRO_NAME at _EXPORT
 #  define @DEPRECATED_MACRO_NAME at _EXPORT @EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
+#endif
+
+#ifndef @DEPRECATED_MACRO_NAME at _NO_EXPORT
 #  define @DEPRECATED_MACRO_NAME at _NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
 #endif
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80d5090a2c084c1b14a4cafce14d8ca9fec8a6c9
commit 80d5090a2c084c1b14a4cafce14d8ca9fec8a6c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 23 07:43:57 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Sep 23 08:04:13 2013 +0200

    GEH: Use the macro for the deprecation attribute after definiting it.
    
    This way, it is more-easily overridden.

diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in
index 80a879d..4fe589d 100644
--- a/Modules/exportheader.cmake.in
+++ b/Modules/exportheader.cmake.in
@@ -23,8 +23,8 @@
 
 #ifndef @DEPRECATED_MACRO_NAME@
 #  define @DEPRECATED_MACRO_NAME@ @DEFINE_DEPRECATED@
-#  define @DEPRECATED_MACRO_NAME at _EXPORT @EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@
-#  define @DEPRECATED_MACRO_NAME at _NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@
+#  define @DEPRECATED_MACRO_NAME at _EXPORT @EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
+#  define @DEPRECATED_MACRO_NAME at _NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
 #endif
 
 #cmakedefine01 DEFINE_NO_DEPRECATED

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

Summary of changes:
 Modules/exportheader.cmake.in |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake