[Cmake-commits] CMake branch, next, updated. v2.8.5-1501-g1b83c00

[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  1b83c004423f584137d0630ecbb895cd519a977e (commit)
       via  1c6b41bee7fb1e2b85be4ab3497889ab72089f69 (commit)
       via  3f7e03643d5437ec494956f2678c7b3c905d8250 (commit)
      from  a1558768fe281a9b706b84596f5ab6a209ffcdc6 (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=1b83c004423f584137d0630ecbb895cd519a977e
commit 1b83c004423f584137d0630ecbb895cd519a977e
Merge: a155876 1c6b41b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 18:21:19 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 18:21:19 2011 -0400

    Merge topic 'generate_export_header' into next
    
    1c6b41b Remember to surround the other deprecated test in the Borland check.
    3f7e036 Export deprecated free methods too.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c6b41bee7fb1e2b85be4ab3497889ab72089f69
commit 1c6b41bee7fb1e2b85be4ab3497889ab72089f69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 00:19:20 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 11 00:19:53 2011 +0200

    Remember to surround the other deprecated test in the Borland check.

diff --git a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
index a41b168..168cae8 100644
--- a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
@@ -11,5 +11,8 @@ static_build_pass("Libstatic l; return l.libstatic_exported();" "Failed to build
 
 if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland)
   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()
-static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f7e03643d5437ec494956f2678c7b3c905d8250
commit 3f7e03643d5437ec494956f2678c7b3c905d8250
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 11 00:18:33 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 11 00:18:33 2011 +0200

    Export deprecated free methods too.
    
    That way they can be linked to even after being deprecated.

diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
index 7df7694..400d664 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
@@ -49,7 +49,7 @@ public:
 
 LIBSHARED_AND_STATIC_EXPORT int libshared_and_static_exported();
 
-LIBSHARED_AND_STATIC_DEPRECATED int libshared_and_static_deprecated();
+LIBSHARED_AND_STATIC_DEPRECATED_EXPORT int libshared_and_static_deprecated();
 
 int libshared_and_static_not_exported();
 
diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
index c6562ec..cd68cdc 100644
--- a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
+++ b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h
@@ -45,7 +45,7 @@ public:
 
 LIBSTATIC_EXPORT int libstatic_exported();
 
-LIBSTATIC_DEPRECATED int libstatic_deprecated();
+LIBSTATIC_DEPRECATED_EXPORT int libstatic_deprecated();
 
 int libstatic_not_exported();
 

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

Summary of changes:
 .../lib_shared_and_static/libshared_and_static.h   |    2 +-
 .../GenerateExportHeader/libstatic/libstatic.h     |    2 +-
 .../libstatictest/CMakeLists.txt                   |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake