[cmake-commits] king committed CMakeLists.txt 1.69 1.70

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv8468/Tests/SimpleInstall

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Do not collapse the INSTALL_NAME_DIR setting because users may intend to have .. in the path.  This makes the makefile generator consistent with the already working Xcode implementation of this feature.  Also added a test for @executable_path/.. style settings for this property.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- CMakeLists.txt	5 Oct 2006 15:31:57 -0000	1.69
+++ CMakeLists.txt	11 Oct 2006 16:41:20 -0000	1.70
@@ -205,7 +205,8 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake)
   SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT 
     ${CMAKE_CURRENT_SOURCE_DIR}/PostInstall.cmake)
-  SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3)
+  SET_TARGET_PROPERTIES(test4 PROPERTIES VERSION 1.2 SOVERSION 3
+        INSTALL_NAME_DIR @executable_path/../lib)
 ENDIF(STAGE2)
 
 IF(CMAKE_CONFIGURATION_TYPES)