From 8d27255aefa4bf372363b1d39f35ed22eb393f8f Mon Sep 17 00:00:00 2001 From: Brad King Date: Sun, 19 Feb 2006 17:44:45 -0500 Subject: [PATCH] ENH: Using CMAKE_SKIP_BUILD_RPATH to test relink support. --- Tests/SimpleInstall/CMakeLists.txt | 5 +++++ Tests/SimpleInstallS2/CMakeLists.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index db2d9fd0e..f8ab86a16 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -4,6 +4,11 @@ SET(CMAKE_VERBOSE_MAKEFILE 1) SET(EXECUTABLE_OUTPUT_PATH "${TestSimpleInstall_BINARY_DIR}/ExecPath") SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}") +# Skip generating the rpath pointing at the build tree to make sure +# the executable is installed with the proper rpath in the install +# tree. +SET(CMAKE_SKIP_BUILD_RPATH 1) + # Skip the dependency that causes a build when installing. This # avoids infinite loops when the post-build rule below installs. SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index db2d9fd0e..f8ab86a16 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -4,6 +4,11 @@ SET(CMAKE_VERBOSE_MAKEFILE 1) SET(EXECUTABLE_OUTPUT_PATH "${TestSimpleInstall_BINARY_DIR}/ExecPath") SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}") +# Skip generating the rpath pointing at the build tree to make sure +# the executable is installed with the proper rpath in the install +# tree. +SET(CMAKE_SKIP_BUILD_RPATH 1) + # Skip the dependency that causes a build when installing. This # avoids infinite loops when the post-build rule below installs. SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)