[cmake-commits] david.cole committed bar.cxx 1.3 1.4 foo.cxx 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Framework
In directory public:/mounts/ram/cvs-serv22075/Tests/Framework

Modified Files:
	bar.cxx foo.cxx 
Log Message:
BUG: Fix test that broke on Windows - sharing sources between SHARED and STATIC libraries requires correct export and import decorations in the source code...


Index: bar.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/bar.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bar.cxx	8 May 2007 16:43:06 -0000	1.3
+++ bar.cxx	1 Aug 2007 20:15:54 -0000	1.4
@@ -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();

Index: foo.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Framework/foo.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- foo.cxx	8 May 2007 16:43:06 -0000	1.3
+++ foo.cxx	1 Aug 2007 20:15:54 -0000	1.4
@@ -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