summaryrefslogtreecommitdiffstats
path: root/Tests/Framework
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2007-08-01 20:15:54 (GMT)
committerDavid Cole <david.cole@kitware.com>2007-08-01 20:15:54 (GMT)
commit64f40a2816de1dcb2e064d961fc0ac4e3c52d551 (patch)
treeece522db3bc90b0023bf6af9d1181298235f3fa1 /Tests/Framework
parentd58b93a5b128ad4f2dce47e8a2c0dd967378e2f2 (diff)
downloadCMake-64f40a2816de1dcb2e064d961fc0ac4e3c52d551.zip
CMake-64f40a2816de1dcb2e064d961fc0ac4e3c52d551.tar.gz
CMake-64f40a2816de1dcb2e064d961fc0ac4e3c52d551.tar.bz2
BUG: Fix test that broke on Windows - sharing sources between SHARED and STATIC libraries requires correct export and import decorations in the source code...
Diffstat (limited to 'Tests/Framework')
-rw-r--r--Tests/Framework/bar.cxx7
-rw-r--r--Tests/Framework/foo.cxx2
2 files changed, 2 insertions, 7 deletions
diff --git a/Tests/Framework/bar.cxx b/Tests/Framework/bar.cxx
index c8ddc0a..37c132a 100644
--- a/Tests/Framework/bar.cxx
+++ b/Tests/Framework/bar.cxx
@@ -1,9 +1,4 @@
-#ifdef _WIN32
-# define CM_TEST_LIB_IMPORT __declspec( dllimport )
-#else
-# define CM_TEST_LIB_IMPORT
-#endif
-CM_TEST_LIB_IMPORT void foo();
+void foo();
int main()
{
foo();
diff --git a/Tests/Framework/foo.cxx b/Tests/Framework/foo.cxx
index 6980888..b249ce3 100644
--- a/Tests/Framework/foo.cxx
+++ b/Tests/Framework/foo.cxx
@@ -1,5 +1,5 @@
#include <stdio.h>
-#ifdef _WIN32
+#if defined(_WIN32) && defined(foo_EXPORTS)
# define CM_TEST_LIB_EXPORT __declspec( dllexport )
#else
# define CM_TEST_LIB_EXPORT