[cmake-commits] hoffman committed CMakeLists.txt 1.4.4.1 1.4.4.2 simple.cxx 1.3.4.1 1.3.4.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt simple.cxx 
Log Message:
ENH: merge changes from the main tree to the 2.4 branch


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/OutOfSource/OutOfSourceSubdir/CMakeLists.txt,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -d -r1.4.4.1 -r1.4.4.2
--- CMakeLists.txt	24 Jul 2006 15:19:36 -0000	1.4.4.1
+++ CMakeLists.txt	13 Oct 2006 14:52:10 -0000	1.4.4.2
@@ -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.3.4.1
retrieving revision 1.3.4.2
diff -u -d -r1.3.4.1 -r1.3.4.2
--- simple.cxx	24 Jul 2006 15:19:36 -0000	1.3.4.1
+++ simple.cxx	13 Oct 2006 14:52:10 -0000	1.3.4.2
@@ -5,9 +5,10 @@
 #include "testdp.h"
 
 extern int simple();
+extern "C" int outlib();
 
 int main ()
-{  
+{
   if(simple() != 123)
     {
     return -3;
@@ -21,5 +22,9 @@
     {
     return -1;
     }
+  if(outlib() != 456)
+    {
+    return -4;
+    }
   return 0;
 }