[Cmake-commits] CMake branch, next, updated. v2.8.5-1693-g5d4ef7e
Stephen Kelly
steveire at gmail.com
Wed Aug 24 09:21:29 EDT 2011
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 5d4ef7edbda771f86a63a2c02816bd811b870aff (commit)
via e0cc024dc90c74ff504995ce9ccd3671f9bf3db2 (commit)
via 1b031d1a3f236f7c2c301e042bdc22bdfc4064c0 (commit)
from 83dc7d053e72d22c398f18b6038dcd3a3404b2ec (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=5d4ef7edbda771f86a63a2c02816bd811b870aff
commit 5d4ef7edbda771f86a63a2c02816bd811b870aff
Merge: 83dc7d0 e0cc024
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 09:21:28 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 09:21:28 2011 -0400
Merge topic 'generate_export_header' into next
e0cc024 Add missing NO_EXPORT macro variant.
1b031d1 More consistency in the macro options.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0cc024dc90c74ff504995ce9ccd3671f9bf3db2
commit e0cc024dc90c74ff504995ce9ccd3671f9bf3db2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 23:26:43 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 23:26:43 2011 +0200
Add missing NO_EXPORT macro variant.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 0fe69a8..e02811a 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -221,8 +221,8 @@ endmacro()
macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
# Option overrides
- set(options)
- set(oneValueArgs PREFIX_NAME BASE_NAME EXPORT_MACRO_NAME EXPORT_FILE_NAME DEPRECATED_MACRO_NAME NO_EXPORT_MACRO_NAME STATIC_DEFINE)
+ set(options DEFINE_NO_DEPRECATED)
+ set(oneValueArgs PREFIX_NAME BASE_NAME EXPORT_MACRO_NAME EXPORT_FILE_NAME DEPRECATED_MACRO_NAME NO_EXPORT_MACRO_NAME STATIC_DEFINE NO_DEPRECATED_MACRO_NAME)
set(multiValueArgs)
cmake_parse_arguments(_GEH "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -242,6 +242,7 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
set(EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME_LOWER}_export.h")
set(DEPRECATED_MACRO_NAME "${PREFIX}${BASE_NAME_UPPER}_DEPRECATED")
set(STATIC_DEFINE "${PREFIX}${BASE_NAME_UPPER}_STATIC_DEFINE")
+ set(NO_DEPRECATED_MACRO_NAME "${BASE_NAME_UPPER}_NO_DEPRECATED")
if(_GEH_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown keywords given to GENERATE_EXPORT_HEADER(): \"${_GEH_UNPARSED_ARGUMENTS}\"")
@@ -267,6 +268,14 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
set(STATIC_DEFINE ${PREFIX}${_GEH_STATIC_DEFINE})
endif()
+ if (_GEH_DEFINE_NO_DEPRECATED)
+ set(DEFINE_NO_DEPRECATED TRUE)
+ endif()
+
+ if (_GEH_NO_DEPRECATED_MACRO_NAME)
+ set(NO_DEPRECATED_MACRO_NAME ${PREFIX}${_GEH_NO_DEPRECATED_MACRO_NAME})
+ endif()
+
set(INCLUDE_GUARD_NAME "${PREFIX}${EXPORT_MACRO_NAME}_H")
get_target_property(EXPORT_IMPORT_CONDITION ${TARGET_LIBRARY} DEFINE_SYMBOL)
diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in
index 83a9335..131d3a7 100644
--- a/Modules/exportheader.cmake.in
+++ b/Modules/exportheader.cmake.in
@@ -27,4 +27,9 @@
# define @DEPRECATED_MACRO_NAME at _NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@
#endif
-#endif // @INCLUDE_GUARD_NAME@
\ No newline at end of file
+#cmakedefine01 DEFINE_NO_DEPRECATED
+#if DEFINE_NO_DEPRECATED
+# define @NO_DEPRECATED_MACRO_NAME@
+#endif
+
+#endif // @INCLUDE_GUARD_NAME@
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b031d1a3f236f7c2c301e042bdc22bdfc4064c0
commit 1b031d1a3f236f7c2c301e042bdc22bdfc4064c0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 23 23:19:31 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 23 23:21:29 2011 +0200
More consistency in the macro options.
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 6225f70..0fe69a8 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -12,7 +12,7 @@
# [BASE_NAME <base_name>]
# [EXPORT_MACRO_NAME <export_macro_name>]
# [EXPORT_FILE_NAME <export_file_name>]
-# [DEPRECATED_NAME <deprecated_name>]
+# [DEPRECATED_MACRO_NAME <deprecated_macro_name>]
# [NO_EXPORT_MACRO_NAME <no_export_macro_name>]
# [STATIC_DEFINE <static_define>]
# )
@@ -78,7 +78,7 @@
#
# add_library(somelib someclass.cpp)
# generate_export_header(somelib
-# DEPRECATED_NAME KDE_DEPRECATED
+# DEPRECATED_MACRO_NAME KDE_DEPRECATED
# )
#
# creates the macro KDE_DEPRECATED instead of SOMELIB_DEPRECATED.
@@ -222,7 +222,7 @@ endmacro()
macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
# Option overrides
set(options)
- set(oneValueArgs PREFIX_NAME BASE_NAME EXPORT_MACRO_NAME EXPORT_FILE_NAME DEPRECATED_NAME NO_EXPORT_MACRO_NAME STATIC_DEFINE)
+ set(oneValueArgs PREFIX_NAME BASE_NAME EXPORT_MACRO_NAME EXPORT_FILE_NAME DEPRECATED_MACRO_NAME NO_EXPORT_MACRO_NAME STATIC_DEFINE)
set(multiValueArgs)
cmake_parse_arguments(_GEH "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -240,7 +240,7 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
set(EXPORT_MACRO_NAME "${PREFIX}${BASE_NAME_UPPER}_EXPORT")
set(NO_EXPORT_MACRO_NAME "${PREFIX}${BASE_NAME_UPPER}_NO_EXPORT")
set(EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME_LOWER}_export.h")
- set(DEPRECATED_NAME "${PREFIX}${BASE_NAME_UPPER}_DEPRECATED")
+ set(DEPRECATED_MACRO_NAME "${PREFIX}${BASE_NAME_UPPER}_DEPRECATED")
set(STATIC_DEFINE "${PREFIX}${BASE_NAME_UPPER}_STATIC_DEFINE")
if(_GEH_UNPARSED_ARGUMENTS)
@@ -257,8 +257,8 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
set(EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${_GEH_EXPORT_FILE_NAME}")
endif()
endif()
- if(_GEH_DEPRECATED_NAME)
- set(DEPRECATED_NAME ${PREFIX}${_GEH_DEPRECATED_NAME})
+ if(_GEH_DEPRECATED_MACRO_NAME)
+ set(DEPRECATED_MACRO_NAME ${PREFIX}${_GEH_DEPRECATED_MACRO_NAME})
endif()
if(_GEH_NO_EXPORT_MACRO_NAME)
set(NO_EXPORT_MACRO_NAME ${PREFIX}${_GEH_NO_EXPORT_MACRO_NAME})
diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in
index 62ed3ff..83a9335 100644
--- a/Modules/exportheader.cmake.in
+++ b/Modules/exportheader.cmake.in
@@ -21,10 +21,10 @@
# endif
#endif
-#ifndef @DEPRECATED_NAME@
-# define @DEPRECATED_NAME@ @DEFINE_DEPRECATED@
-# define @DEPRECATED_NAME at _EXPORT @EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@
-# define @DEPRECATED_NAME at _NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@
+#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@
#endif
#endif // @INCLUDE_GUARD_NAME@
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
Modules/GenerateExportHeader.cmake | 23 ++++++++++++++++-------
Modules/exportheader.cmake.in | 15 ++++++++++-----
2 files changed, 26 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list