[Cmake-commits] CMake branch, next, updated. v3.3.1-2566-g5328d0b

[Brad King]

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  5328d0bd617c6cdcbed1413924cc434acb32dd0b (commit)
       via  3e2865b46744e543af3045331b31b94df2ebe1ad (commit)
      from  101e2c1853a6edfdf10fe7786e695defc613b3b5 (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=5328d0bd617c6cdcbed1413924cc434acb32dd0b
commit 5328d0bd617c6cdcbed1413924cc434acb32dd0b
Merge: 101e2c1 3e2865b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 27 11:14:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 27 11:14:53 2015 -0400

    Merge topic 'GenerateExportHeader-cygwin-dllexport' into next
    
    3e2865b4 GenerateExportHeader: Use dllexport/dllimport on Cygwin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e2865b46744e543af3045331b31b94df2ebe1ad
commit 3e2865b46744e543af3045331b31b94df2ebe1ad
Author:     Tony Kelman <tony at kelman.net>
AuthorDate: Thu Aug 27 07:48:18 2015 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 27 10:08:34 2015 -0400

    GenerateExportHeader: Use dllexport/dllimport on Cygwin
    
    Cygwin sits on top of Windows and so can use explicit symbol
    export and import markup too.
    
    Co-Author: Yaakov Selkowitz <yselkowitz at cygwin.com>

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index aab29ea..8205425 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -268,7 +268,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
 
   if(NOT ${type} STREQUAL "STATIC_LIBRARY")
-    if(WIN32)
+    if(WIN32 OR CYGWIN)
       set(DEFINE_EXPORT "__declspec(dllexport)")
       set(DEFINE_IMPORT "__declspec(dllimport)")
     elseif(COMPILER_HAS_HIDDEN_VISIBILITY AND USE_COMPILER_HIDDEN_VISIBILITY)
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index b52c44d..8cd25a4 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -106,10 +106,10 @@ endif()
 add_executable(GenerateExportHeader exportheader_test.cpp)
 
 target_link_libraries(GenerateExportHeader ${link_libraries})
-if (WIN32)
+if (WIN32 OR CYGWIN)
   if(MSVC AND COMPILER_HAS_DEPRECATED)
     set(_platform Win32)
-  elseif(MINGW AND COMPILER_HAS_DEPRECATED)
+  elseif((MINGW OR CYGWIN) AND COMPILER_HAS_DEPRECATED)
     set(_platform MinGW)
   else()
     set(_platform WinEmpty)

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

Summary of changes:
 Modules/GenerateExportHeader.cmake               |    2 +-
 Tests/Module/GenerateExportHeader/CMakeLists.txt |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake