[cmake-commits] king committed CMakeLists.txt 1.5 1.6 simple.cxx 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir
In directory public:/mounts/ram/cvs-serv17485/Tests/OutOfSource/OutOfSourceSubdir

Modified Files:
	CMakeLists.txt simple.cxx 
Log Message:
BUG: Fixed out-of-source subdirectories to work when they are also out-of-binary.  Updated the OutOfSource test to test this feature.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CMakeLists.txt	7 Jul 2006 13:54:29 -0000	1.5
+++ CMakeLists.txt	10 Oct 2006 01:25:58 -0000	1.6
@@ -4,7 +4,7 @@
   SET(BUILD_SHARED_LIBS 1)
   ADD_LIBRARY(testlib testlib.cxx)
   ADD_EXECUTABLE (simple simple.cxx ../simple.cxx)
-  TARGET_LINK_LIBRARIES(simple testlib)
+  TARGET_LINK_LIBRARIES(simple testlib outlib)
 ENDIF ("${PROJECT_SOURCE_DIR}" STREQUAL "${ANOTHER_PROJ_SOURCE_DIR}")
 
 # test getting a definition from a subdir

Index: simple.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- simple.cxx	7 Jul 2006 13:54:29 -0000	1.4
+++ simple.cxx	10 Oct 2006 01:25:58 -0000	1.5
@@ -5,6 +5,7 @@
 #include "testdp.h"
 
 extern int simple();
+extern "C" int outlib();
 
 int main ()
 {
@@ -21,5 +22,9 @@
     {
     return -1;
     }
+  if(outlib() != 456)
+    {
+    return -4;
+    }
   return 0;
 }