[cmake-commits] king committed CMakeLists.txt 1.8 1.9

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 1 13:08:14 EST 2008


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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Remove InstallNameFixupPath from cmTarget and cmInstallTargetGenerator.

  - Motivation:
    - It depended on the order of installation
    - It supported only a single destination for each target
    - It created directory portions of an install name without user request
  - Updated ExportImport test to install targets in an order that expoed
    this bug


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Export/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeLists.txt	1 Feb 2008 14:57:47 -0000	1.8
+++ CMakeLists.txt	1 Feb 2008 18:08:12 -0000	1.9
@@ -37,14 +37,6 @@
 # Install and export from install tree.
 install(
   TARGETS
-  testExe2libImp testLib3Imp
-  EXPORT exp
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib/impl
-  ARCHIVE DESTINATION lib/impl
-  )
-install(
-  TARGETS
   testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 testExe3
   testExe2lib
   EXPORT exp
@@ -54,6 +46,14 @@
   FRAMEWORK DESTINATION Frameworks
   BUNDLE DESTINATION Applications
   )
+install(
+  TARGETS
+  testExe2libImp testLib3Imp
+  EXPORT exp
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib/impl
+  ARCHIVE DESTINATION lib/impl
+  )
 install(EXPORT exp NAMESPACE exp_ DESTINATION lib/exp)
 
 # Export from build tree.



More information about the Cmake-commits mailing list