[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6164-g79cd32e

[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  79cd32e502535af8d7f70de4f6480ad940969cfe (commit)
       via  51953108900f3c2e7d0e6e748357e991f5314172 (commit)
      from  18058d64d5c6741c06b2416865096caedc2f43b6 (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=79cd32e502535af8d7f70de4f6480ad940969cfe
commit 79cd32e502535af8d7f70de4f6480ad940969cfe
Merge: 18058d6 5195310
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 06:55:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 11 06:55:41 2013 -0500

    Merge topic 'GenerateExportHeader-tests' into next
    
    5195310 Add reference files for MinGW.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51953108900f3c2e7d0e6e748357e991f5314172
commit 51953108900f3c2e7d0e6e748357e991f5314172
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 12:55:05 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 11 12:55:05 2013 +0100

    Add reference files for MinGW.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 864929b..3c0254e 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -185,7 +185,11 @@ add_executable(GenerateExportHeader exportheader_test.cpp)
 
 target_link_libraries(GenerateExportHeader ${link_libraries})
 if (WIN32)
-  set(_platform Win32)
+  if(MSVC)
+    set(_platform Win32)
+  else()
+    set(_platform MinGW)
+  endif()
 elseif(NOT USE_COMPILER_HIDDEN_VISIBILITY)
   set(_platform Empty)
 else()
diff --git a/Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h b/Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h
new file mode 100644
index 0000000..d376631
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h
@@ -0,0 +1,41 @@
+
+#ifndef LIBSHARED_EXPORT_H
+#define LIBSHARED_EXPORT_H
+
+#ifdef LIBSHARED_STATIC_DEFINE
+#  define LIBSHARED_EXPORT
+#  define LIBSHARED_NO_EXPORT
+#else
+#  ifndef LIBSHARED_EXPORT
+#    ifdef libshared_EXPORTS
+        /* We are building this library */
+#      define LIBSHARED_EXPORT __declspec(dllexport)
+#    else
+        /* We are using this library */
+#      define LIBSHARED_EXPORT __declspec(dllimport)
+#    endif
+#  endif
+
+#  ifndef LIBSHARED_NO_EXPORT
+#    define LIBSHARED_NO_EXPORT
+#  endif
+#endif
+
+#ifndef LIBSHARED_DEPRECATED
+#  define LIBSHARED_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef LIBSHARED_DEPRECATED_EXPORT
+#  define LIBSHARED_DEPRECATED_EXPORT LIBSHARED_EXPORT LIBSHARED_DEPRECATED
+#endif
+
+#ifndef LIBSHARED_DEPRECATED_NO_EXPORT
+#  define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
+#endif
+
+#define DEFINE_NO_DEPRECATED 0
+#if DEFINE_NO_DEPRECATED
+# define LIBSHARED_NO_DEPRECATED
+#endif
+
+#endif
diff --git a/Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h b/Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h
new file mode 100644
index 0000000..fd021e9
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h
@@ -0,0 +1,41 @@
+
+#ifndef LIBSTATIC_EXPORT_H
+#define LIBSTATIC_EXPORT_H
+
+#ifdef LIBSTATIC_STATIC_DEFINE
+#  define LIBSTATIC_EXPORT
+#  define LIBSTATIC_NO_EXPORT
+#else
+#  ifndef LIBSTATIC_EXPORT
+#    ifdef libstatic_EXPORTS
+        /* We are building this library */
+#      define LIBSTATIC_EXPORT
+#    else
+        /* We are using this library */
+#      define LIBSTATIC_EXPORT
+#    endif
+#  endif
+
+#  ifndef LIBSTATIC_NO_EXPORT
+#    define LIBSTATIC_NO_EXPORT
+#  endif
+#endif
+
+#ifndef LIBSTATIC_DEPRECATED
+#  define LIBSTATIC_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef LIBSTATIC_DEPRECATED_EXPORT
+#  define LIBSTATIC_DEPRECATED_EXPORT LIBSTATIC_EXPORT LIBSTATIC_DEPRECATED
+#endif
+
+#ifndef LIBSTATIC_DEPRECATED_NO_EXPORT
+#  define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
+#endif
+
+#define DEFINE_NO_DEPRECATED 0
+#if DEFINE_NO_DEPRECATED
+# define LIBSTATIC_NO_DEPRECATED
+#endif
+
+#endif

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

Summary of changes:
 Tests/Module/GenerateExportHeader/CMakeLists.txt   |    6 +++++-
 .../reference/{Win32 => MinGW}/libshared_export.h  |    2 +-
 .../reference/{UNIX => MinGW}/libstatic_export.h   |    0
 3 files changed, 6 insertions(+), 2 deletions(-)
 copy Tests/Module/GenerateExportHeader/reference/{Win32 => MinGW}/libshared_export.h (93%)
 copy Tests/Module/GenerateExportHeader/reference/{UNIX => MinGW}/libstatic_export.h (100%)


hooks/post-receive
-- 
CMake