[Cmake-commits] CMake branch, next, updated. v2.8.5-1551-g553a4c9
Stephen Kelly
steveire at gmail.com
Sun Aug 14 09:52:51 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 553a4c956404dc0f53fb33b304b81922c9f7c089 (commit)
via 10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4 (commit)
via 97392a7dd3ca141285e22507bfdae6c640512e76 (commit)
from 1fdc2556e9cdfdd066fdded83aca0c6907523e76 (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=553a4c956404dc0f53fb33b304b81922c9f7c089
commit 553a4c956404dc0f53fb33b304b81922c9f7c089
Merge: 1fdc255 10d8c44
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 14 09:52:44 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 14 09:52:44 2011 -0400
Merge topic 'generate_export_header' into next
10d8c44 Disable testing of deprecated macros.
97392a7d Fixup forgotten part of aed84517c942a4c40f493fcf997cdf6a047349f8
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4
commit 10d8c446d5893446eaf4bd6e295fb6ea0d83d7f4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 14 15:42:31 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Aug 14 15:45:36 2011 +0200
Disable testing of deprecated macros.
It is not possible to test for it sanely across multiple ancient
compilers supported by cmake.
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
index 28d6c65..207534d 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt
@@ -17,13 +17,13 @@ endmacro()
static_variant_build_pass("return libshared_and_static_exported();" "Failed to build static variant")
shared_variant_build_pass("return libshared_and_static_exported();" "Failed to build shared variant")
-if (COMPILER_HAS_DEPRECATED)
- shared_variant_build_fail("return libshared_and_static_deprecated();" "Built shared deprecated variant")
- static_variant_build_fail("return libshared_and_static_deprecated();" "Built static deprecated variant")
-else()
- shared_variant_build_pass("return libshared_and_static_deprecated();" "Built shared deprecated variant")
- static_variant_build_pass("return libshared_and_static_deprecated();" "Built static deprecated variant")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# shared_variant_build_fail("return libshared_and_static_deprecated();" "Built shared deprecated variant")
+# static_variant_build_fail("return libshared_and_static_deprecated();" "Built static deprecated variant")
+# else()
+# shared_variant_build_pass("return libshared_and_static_deprecated();" "Built shared deprecated variant")
+# static_variant_build_pass("return libshared_and_static_deprecated();" "Built static deprecated variant")
+# endif()
static_variant_build_pass("return libshared_and_static_not_exported();" "Failed to build static not exported variant")
if (WIN32 OR COMPILER_HAS_HIDDEN_VISIBILITY)
diff --git a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
index 288089e..a5804fc 100644
--- a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt
@@ -9,11 +9,11 @@ endmacro()
shared_build_pass("Libshared l; return l.libshared_exported();" "Failed to build exported")
-if (COMPILER_HAS_DEPRECATED)
- shared_build_fail("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
-else()
- shared_build_pass("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# shared_build_fail("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# else()
+# shared_build_pass("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# endif()
if (COMPILER_HAS_HIDDEN_VISIBILITY)
shared_build_fail("Libshared l; return l.libshared_excluded();" "Built use of excluded class method. This should not be possible.")
else()
diff --git a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
index 14ca05b..eb6bb87 100644
--- a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
@@ -9,10 +9,10 @@ endmacro()
static_build_pass("Libstatic l; return l.libstatic_exported();" "Failed to build exported.")
-if (COMPILER_HAS_DEPRECATED)
- static_build_fail("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
- static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
-else()
- static_build_pass("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
- static_build_pass("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
-endif()
+# if (COMPILER_HAS_DEPRECATED)
+# static_build_fail("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
+# else()
+# static_build_pass("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+# static_build_pass("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
+# endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97392a7dd3ca141285e22507bfdae6c640512e76
commit 97392a7dd3ca141285e22507bfdae6c640512e76
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 14 15:37:24 2011 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Aug 14 15:37:24 2011 +0200
Fixup forgotten part of aed84517c942a4c40f493fcf997cdf6a047349f8
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 5b42b77..758eb25 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -178,10 +178,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
set(DEFINE_IMPORT)
set(DEFINE_NO_EXPORT)
- if (COMPILER_HAS_DEPRECATED_DECLSPEC)
- set(DEFINE_DEPRECATED "__declspec(deprecated)")
- elseif(COMPILER_HAS_DEPRECATED)
+ if (COMPILER_HAS_DEPRECATED_ATTR)
set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
+ elseif(COMPILER_HAS_DEPRECATED)
+ set(DEFINE_DEPRECATED "__declspec(deprecated)")
endif()
get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
-----------------------------------------------------------------------
Summary of changes:
Modules/GenerateExportHeader.cmake | 6 +++---
.../lib_shared_and_statictest/CMakeLists.txt | 14 +++++++-------
.../libsharedtest/CMakeLists.txt | 10 +++++-----
.../libstatictest/CMakeLists.txt | 14 +++++++-------
4 files changed, 22 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list