diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-06-17 14:03:56 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-17 14:04:47 (GMT) |
commit | 77e59e442d110b2cb3c5d206e79f631175805974 (patch) | |
tree | 0b6fa9ab1654f030a042d6578f1cdfe034dd48dc /Tests/RunCMake/CMakeLists.txt | |
parent | 2c2c575383c049a312a9a276e195df6699364530 (diff) | |
parent | 4caefbb42369cf652df920edd07ee9e81eb95577 (diff) | |
download | CMake-77e59e442d110b2cb3c5d206e79f631175805974.zip CMake-77e59e442d110b2cb3c5d206e79f631175805974.tar.gz CMake-77e59e442d110b2cb3c5d206e79f631175805974.tar.bz2 |
Merge topic 'escape-install-rpath'
4caefbb423 cmInstallTargetGenerator: Add tests for the RPATH_CHANGE rule
749ce48eb5 cmInstallTargetGenerator: Escape generated OLD_RPATH argument
9e84c7c5e8 cmInstallTargetGenerator: Introduce CMP0095
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3383
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
-rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 788d947..735ad5f 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -408,7 +408,12 @@ else() set(NO_NAMELINK 0) endif() -add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}) +add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} + -DCMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN=${CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN} + -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} + -DCMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG=${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG} + -DCMAKE_EXECUTABLE_FORMAT=${CMAKE_EXECUTABLE_FORMAT}) + add_RunCMake_test(CPackCommandLine) add_RunCMake_test(CPackConfig) add_RunCMake_test(CPackInstallProperties) |