[Cmake-commits] CMake branch, next, updated. v2.8.5-1487-g3621ad6

[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  3621ad6e511fb0f9190ec51621b970ffb30d3434 (commit)
       via  fc3772edc9efc924f9d76c630719914c556e1d4e (commit)
      from  2de4471256fc40a1d6c13b5199e3efdaa57e32ba (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=3621ad6e511fb0f9190ec51621b970ffb30d3434
commit 3621ad6e511fb0f9190ec51621b970ffb30d3434
Merge: 2de4471 fc3772e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 15:43:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 15:43:45 2011 -0400

    Merge topic 'generate_export_header' into next
    
    fc3772e Another attempt to fix the tests on Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc3772edc9efc924f9d76c630719914c556e1d4e
commit fc3772edc9efc924f9d76c630719914c556e1d4e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 21:43:16 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 21:43:16 2011 +0200

    Another attempt to fix the tests on Borland.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 1395f15..1578365 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -148,8 +148,10 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   set(DEFINE_IMPORT)
   set(DEFINE_NO_EXPORT)
 
-  if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
-    set(DEFINE_DEPRECATED "__declspec(deprecated)")
+  if(WIN32)
+    if (${CMAKE_CXX_COMPILER_ID} MATCHES Borland)
+      set(DEFINE_DEPRECATED "__declspec(deprecated)")
+    endif()
   else()
     set(DEFINE_DEPRECATED "__attribute__ ((__deprecated__))")
   endif()
@@ -157,9 +159,11 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
 
   if(NOT ${type} STREQUAL "STATIC_LIBRARY")
-    if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
-      set(DEFINE_EXPORT "__declspec(dllexport)")
-      set(DEFINE_IMPORT "__declspec(dllimport)")
+    if(WIN32)
+      if (NOT (${CMAKE_CXX_COMPILER_ID} MATCHES Borland))
+        set(DEFINE_EXPORT "__declspec(dllexport)")
+        set(DEFINE_IMPORT "__declspec(dllimport)")
+      endif()
     elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
       set(DEFINE_EXPORT "__attribute__((visibility(\"default\")))")
       set(DEFINE_IMPORT "__attribute__((visibility(\"default\")))")

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

Summary of changes:
 Modules/GenerateExportHeader.cmake |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake