[Cmake-commits] CMake branch, next, updated. v2.8.4-1570-gb073e6d
Brad King
brad.king at kitware.com
Fri May 20 08:08:24 EDT 2011
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 b073e6da1a34ad719bcfb7978d2b6b390cc5277e (commit)
via cdc2b41cc2161b21192460bb92da40c6d4c6107f (commit)
from 2d71e819c60a77787f9cdea5e281289404d9f8a7 (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=b073e6da1a34ad719bcfb7978d2b6b390cc5277e
commit b073e6da1a34ad719bcfb7978d2b6b390cc5277e
Merge: 2d71e81 cdc2b41
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 20 08:08:22 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 20 08:08:22 2011 -0400
Merge topic 'output-compile-lines' into next
cdc2b41 Fix CompileCommandOutput test build on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdc2b41cc2161b21192460bb92da40c6d4c6107f
commit cdc2b41cc2161b21192460bb92da40c6d4c6107f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 20 08:06:35 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 20 08:06:35 2011 -0400
Fix CompileCommandOutput test build on Windows
Add dllexport markup for the shared library.
diff --git a/Tests/CompileCommandOutput/relative.h b/Tests/CompileCommandOutput/relative.h
index 2168035..ddfe551 100644
--- a/Tests/CompileCommandOutput/relative.h
+++ b/Tests/CompileCommandOutput/relative.h
@@ -1 +1,11 @@
-void relative();
+#if defined(_WIN32)
+# ifdef test2_EXPORTS
+# define TEST2_EXPORT __declspec(dllexport)
+# else
+# define TEST2_EXPORT __declspec(dllimport)
+# endif
+#else
+# define TEST2_EXPORT
+#endif
+
+TEST2_EXPORT void relative();
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileCommandOutput/relative.h | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list