kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Use target property for INSTALL_RPATH of SimpleInstall so that it is the only one that needs to relink.

This commit is contained in:
Brad King 2006-02-16 15:28:09 -05:00
parent b07ece004c
commit c70da1aae6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/SimpleInstall/CMakeLists.txt
View File

@ -8,9 +8,6 @@ SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}")
# avoids infinite loops when the post-build rule below installs. # avoids infinite loops when the post-build rule below installs.
SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1) SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
# Make sure the test executable can run from the install tree.
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
SET(EXTRA_INSTALL_FLAGS) SET(EXTRA_INSTALL_FLAGS)
@ -69,6 +66,10 @@ ELSE(STAGE2)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4)
SET(install_target SimpleInstall) SET(install_target SimpleInstall)
# Make sure the test executable can run from the install tree.
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
IF(CMAKE_GENERATOR MATCHES "Makefiles") IF(CMAKE_GENERATOR MATCHES "Makefiles")
ADD_SUBDIRECTORY(TestSubDir) ADD_SUBDIRECTORY(TestSubDir)
ADD_DEPENDENCIES(SimpleInstall TSD) ADD_DEPENDENCIES(SimpleInstall TSD)

7
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -8,9 +8,6 @@ SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}")
# avoids infinite loops when the post-build rule below installs. # avoids infinite loops when the post-build rule below installs.
SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1) SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
# Make sure the test executable can run from the install tree.
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
SET(EXTRA_INSTALL_FLAGS) SET(EXTRA_INSTALL_FLAGS)
@ -69,6 +66,10 @@ ELSE(STAGE2)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4)
SET(install_target SimpleInstall) SET(install_target SimpleInstall)
# Make sure the test executable can run from the install tree.
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
IF(CMAKE_GENERATOR MATCHES "Makefiles") IF(CMAKE_GENERATOR MATCHES "Makefiles")
ADD_SUBDIRECTORY(TestSubDir) ADD_SUBDIRECTORY(TestSubDir)
ADD_DEPENDENCIES(SimpleInstall TSD) ADD_DEPENDENCIES(SimpleInstall TSD)