[cmake-commits] king committed CMakeLists.txt 1.2 1.3 imp_testExe1.c 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jan 28 14:46:18 EST 2008


Update of /cvsroot/CMake/CMake/Tests/ExportImport/Import
In directory public:/mounts/ram/cvs-serv26285/Tests/ExportImport/Import

Modified Files:
	CMakeLists.txt imp_testExe1.c 
Log Message:
ENH: Support exporting/importing of AppBundle targets.

  - Imported bundles have the MACOSX_BUNDLE property set
  - Added cmTarget::IsAppBundleOnApple method to simplify checks
  - Document BUNDLE keyword in INSTALL command
  - Updated IMPORTED_LOCATION property documentation for bundles
  - Updated ExportImport test to test bundles


Index: imp_testExe1.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/imp_testExe1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imp_testExe1.c	28 Jan 2008 18:06:17 -0000	1.2
+++ imp_testExe1.c	28 Jan 2008 19:46:16 -0000	1.3
@@ -1,9 +1,11 @@
 extern int generated_by_testExe1();
+extern int generated_by_testExe3();
 extern int testLib2();
 extern int testLib3();
 extern int testLib4();
 
 int main()
 {
-  return testLib2() + generated_by_testExe1() + testLib3() + testLib4();
+  return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
+          + generated_by_testExe3());
 }

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CMakeLists.txt	28 Jan 2008 18:06:17 -0000	1.2
+++ CMakeLists.txt	28 Jan 2008 19:46:16 -0000	1.3
@@ -17,10 +17,16 @@
   COMMAND exp_testExe1 ${Import_BINARY_DIR}/exp_generated.c
   DEPENDS exp_testExe1
   )
+add_custom_command(
+  OUTPUT ${Import_BINARY_DIR}/exp_generated3.c
+  COMMAND exp_testExe3 ${Import_BINARY_DIR}/exp_generated3.c
+  DEPENDS exp_testExe3
+  )
 
 add_executable(imp_testExe1
   imp_testExe1.c
   ${Import_BINARY_DIR}/exp_generated.c
+  ${Import_BINARY_DIR}/exp_generated3.c
   )
 
 # Try linking to a library imported from the install tree.
@@ -36,10 +42,16 @@
   COMMAND bld_testExe1 ${Import_BINARY_DIR}/bld_generated.c
   DEPENDS bld_testExe1
   )
+add_custom_command(
+  OUTPUT ${Import_BINARY_DIR}/bld_generated3.c
+  COMMAND bld_testExe3 ${Import_BINARY_DIR}/bld_generated3.c
+  DEPENDS bld_testExe3
+  )
 
 add_executable(imp_testExe1b
   imp_testExe1.c
   ${Import_BINARY_DIR}/bld_generated.c
+  ${Import_BINARY_DIR}/bld_generated3.c
   )
 
 # Try linking to a library imported from the build tree.



More information about the Cmake-commits mailing list