[Cmake-commits] CMake branch, next, updated. v2.8.11-2182-g8cbb11d

[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  8cbb11de8f1df8ea09a221c65a1ad95910c49eac (commit)
       via  7ffef5024aa92a9802785c2e02abfd13249e6160 (commit)
      from  6f89e1c4a21e4eeb95d2885527872aa3d2beb0ec (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=8cbb11de8f1df8ea09a221c65a1ad95910c49eac
commit 8cbb11de8f1df8ea09a221c65a1ad95910c49eac
Merge: 6f89e1c 7ffef50
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 23 13:27:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 23 13:27:43 2013 -0400

    Merge topic 'geh-MODULE-export' into next
    
    7ffef50 GenerateExportHeader: Allow use of of this macro with MODULEs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ffef5024aa92a9802785c2e02abfd13249e6160
commit 7ffef5024aa92a9802785c2e02abfd13249e6160
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 14 16:37:49 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 23 19:24:34 2013 +0200

    GenerateExportHeader: Allow use of of this macro with MODULEs.
    
    The significant issue with MODULEs is that on Windows, the exported
    symbols must be dllexported and they are not imported.
    
    In other export macro implementations this is done by defining an
    export macro outside of any ifdef which depends on definitions set
    on the command line. However, with cmake we already expect the
    DEFINE_SYMBOL to be defined, so the regular EXPORT macro can be
    used by such plugins.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 892ebc6..80475a8 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -307,11 +307,9 @@ endmacro()
 
 function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
-  if(${type} STREQUAL "MODULE")
-    message(WARNING "This macro should not be used with libraries of type MODULE")
-    return()
-  endif()
-  if(NOT ${type} STREQUAL "STATIC_LIBRARY" AND NOT ${type} STREQUAL "SHARED_LIBRARY")
+  if(NOT ${type} STREQUAL "STATIC_LIBRARY"
+      AND NOT ${type} STREQUAL "SHARED_LIBRARY"
+      AND NOT ${type} STREQUAL "MODULE_LIBRARY")
     message(WARNING "This macro can only be used with libraries")
     return()
   endif()

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

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


hooks/post-receive
-- 
CMake