[cmake-commits] david.cole committed CMakeLists.txt 1.7 1.8

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Aug 24 13:30:42 EDT 2007


Update of /cvsroot/CMake/CMake/Tests/BundleTest
In directory public:/mounts/ram/cvs-serv3394/Tests/BundleTest

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Add InstallNameFixupPath to support installing built frameworks on the Mac. Change Application to Applications in the BundleTest. Also correct small typo (tcl->Tcl) noted in bug 4572.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BundleTest/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CMakeLists.txt	6 Jul 2006 20:05:54 -0000	1.7
+++ CMakeLists.txt	24 Aug 2007 17:30:40 -0000	1.8
@@ -36,9 +36,9 @@
 TARGET_LINK_LIBRARIES(BundleTest BundleTestLib)
 
 # Test bundle installation.
-#INSTALL(TARGETS BundleTestLib DESTINATION Application/BundleTestExe.app/Contents/Plugins)
-INSTALL(TARGETS BundleTestLib DESTINATION Application/SecondBundleExe.app/Contents/Plugins)
-INSTALL(TARGETS BundleTest DESTINATION Application)
+#INSTALL(TARGETS BundleTestLib DESTINATION Applications/BundleTestExe.app/Contents/Plugins)
+INSTALL(TARGETS BundleTestLib DESTINATION Applications/SecondBundleExe.app/Contents/Plugins)
+INSTALL(TARGETS BundleTest DESTINATION Applications)
 
 # Test whether bundles respect the output name.  Since the library is
 # installed into a location that uses this output name this will fail if the
@@ -59,7 +59,7 @@
 
 # test the framework find stuff
 IF(EXISTS /usr/lib/libtcl.dylib
-    AND EXISTS /System/Library/Frameworks/tcl.framework)
+    AND EXISTS /System/Library/Frameworks/Tcl.framework)
   SET(TCL NOTFOUND)
   FIND_LIBRARY(TCL tcl)
   MESSAGE("frame: ${TCL}")
@@ -87,6 +87,6 @@
   ENDIF(NOT "${TCL}" MATCHES .framework)
   MESSAGE("frame: ${TCL}")
 ENDIF(EXISTS /usr/lib/libtcl.dylib
-  AND EXISTS /System/Library/Frameworks/tcl.framework)
+  AND EXISTS /System/Library/Frameworks/Tcl.framework)
 
 SUBDIRS(BundleSubDir)



More information about the Cmake-commits mailing list