[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6198-g58a99f4

[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  58a99f40bb9ee6cc5cb0b85b700733cc14cc3788 (commit)
       via  694d36fb5571fc26eea02d427298a1de374ab867 (commit)
      from  53e3e97c7e7e206922f517930fc76e0b870c04c7 (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=58a99f40bb9ee6cc5cb0b85b700733cc14cc3788
commit 58a99f40bb9ee6cc5cb0b85b700733cc14cc3788
Merge: 53e3e97 694d36f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 10:53:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 11 10:53:14 2013 -0500

    Merge topic 'GenerateExportHeader-tests' into next
    
    694d36f Fix Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=694d36fb5571fc26eea02d427298a1de374ab867
commit 694d36fb5571fc26eea02d427298a1de374ab867
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 15:32:36 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 11 16:52:38 2013 +0100

    Fix Borland.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index b98b54a..73ad5e3 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -190,7 +190,7 @@ if (WIN32)
   elseif(MINGW)
     set(_platform MinGW)
   else()
-    set(_platform Empty)
+    set(_platform WinEmpty)
   endif()
 elseif(NOT USE_COMPILER_HIDDEN_VISIBILITY)
   set(_platform Empty)
diff --git a/Tests/Module/GenerateExportHeader/reference/WinEmpty/libshared_export.h b/Tests/Module/GenerateExportHeader/reference/WinEmpty/libshared_export.h
new file mode 100644
index 0000000..2dc41d4
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/WinEmpty/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
+#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/WinEmpty/libstatic_export.h b/Tests/Module/GenerateExportHeader/reference/WinEmpty/libstatic_export.h
new file mode 100644
index 0000000..e8000e2
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/WinEmpty/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
+#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   |    2 +-
 .../{Win32 => WinEmpty}/libshared_export.h         |    2 +-
 .../{Empty => WinEmpty}/libstatic_export.h         |    0
 3 files changed, 2 insertions(+), 2 deletions(-)
 copy Tests/Module/GenerateExportHeader/reference/{Win32 => WinEmpty}/libshared_export.h (94%)
 copy Tests/Module/GenerateExportHeader/reference/{Empty => WinEmpty}/libstatic_export.h (100%)


hooks/post-receive
-- 
CMake