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 18058d64d5c6741c06b2416865096caedc2f43b6 (commit)
via da14b47fcbfca7bfdea1b0d00e43a0c5bd23ff90 (commit)
from 471fe9e519d8a0f7486cf9a5da615a1a5d34905e (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=18058d64d5c6741c06b2416865096caedc2f43b6
commit 18058d64d5c6741c06b2416865096caedc2f43b6
Merge: 471fe9e da14b47
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 06:51:02 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 11 06:51:02 2013 -0500
Merge topic 'GenerateExportHeader-tests' into next
da14b47 Add reference files for older compilers.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da14b47fcbfca7bfdea1b0d00e43a0c5bd23ff90
commit da14b47fcbfca7bfdea1b0d00e43a0c5bd23ff90
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Dec 11 12:49:07 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Dec 11 12:49:07 2013 +0100
Add reference files for older compilers.
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt
b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index dc1d7f2..864929b 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -186,6 +186,8 @@ add_executable(GenerateExportHeader exportheader_test.cpp)
target_link_libraries(GenerateExportHeader ${link_libraries})
if (WIN32)
set(_platform Win32)
+elseif(NOT USE_COMPILER_HIDDEN_VISIBILITY)
+ set(_platform Empty)
else()
set(_platform UNIX)
endif()
diff --git
a/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h
b/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h
new file mode 100644
index 0000000..b6749b2
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/Empty/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
+# else
+ /* We are using this library */
+# define LIBSHARED_EXPORT
+# 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/Empty/libstatic_export.h
b/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h
new file mode 100644
index 0000000..e8000e2
--- /dev/null
+++ b/Tests/Module/GenerateExportHeader/reference/Empty/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 ++
.../reference/{Win32 => Empty}/libshared_export.h | 6 +++---
.../reference/{Win32 => Empty}/libstatic_export.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
copy Tests/Module/GenerateExportHeader/reference/{Win32 =>
Empty}/libshared_export.h (83%)
copy Tests/Module/GenerateExportHeader/reference/{Win32 =>
Empty}/libstatic_export.h (94%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
