[cmake-commits] king committed CMakeLists.txt 1.6 1.7

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Jan 31 15:45:33 EST 2008


Update of /cvsroot/CMake/CMake/Tests/ExportImport/Export
In directory public:/mounts/ram/cvs-serv30509/Tests/ExportImport/Export

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Support linking to shared libs with dependent libs

  - Split IMPORTED_LINK_LIBRARIES into two parts:
      IMPORTED_LINK_INTERFACE_LIBRARIES
      IMPORTED_LINK_DEPENDENT_LIBRARIES
  - Add CMAKE_DEPENDENT_SHARED_LIBRARY_MODE to select behavior
  - Set mode to LINK for Darwin (fixes universal binary problem)
  - Update ExportImport test to account for changes


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Export/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CMakeLists.txt	30 Jan 2008 22:26:09 -0000	1.6
+++ CMakeLists.txt	31 Jan 2008 20:45:31 -0000	1.7
@@ -32,18 +32,12 @@
 add_executable(testExe3 testExe3.c)
 set_property(TARGET testExe3 PROPERTY MACOSX_BUNDLE 1)
 
-# Install helper targets that are not part of the interface.
-install(
-  TARGETS testExe2libImp testLib3Imp
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  )
-
 # Install and export from install tree.
 install(
-  TARGETS testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 testExe3
-          testExe2lib
+  TARGETS
+  testExe2libImp testLib3Imp
+  testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 testExe3
+  testExe2lib
   EXPORT exp
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib
@@ -55,6 +49,7 @@
 
 # Export from build tree.
 export(TARGETS testExe1 testLib1 testLib2 testLib3
+  testExe2libImp testLib3Imp
   NAMESPACE bld_
   FILE ExportBuildTree.cmake
   )



More information about the Cmake-commits mailing list