diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-05 17:54:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-05 17:54:52 (GMT) |
| commit | d7489e132c0f329db2f09e1d2d196367f6b0280d (patch) | |
| tree | dbeb5430c4695d053ad78923c98b195d39963d45 | |
| parent | 6a263cee22451f22a4b1cbbf1a41b22a2e1f78af (diff) | |
| parent | f8fed12250d7c73823087c2e07ea5d3bf2005163 (diff) | |
| download | CMake-d7489e132c0f329db2f09e1d2d196367f6b0280d.zip CMake-d7489e132c0f329db2f09e1d2d196367f6b0280d.tar.gz CMake-d7489e132c0f329db2f09e1d2d196367f6b0280d.tar.bz2 | |
Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES-rpath-xl'
f8fed12250 Tests: Enable RunCMake.file-GET_RUNTIME_DEPENDENCIES linux cases on XL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7980
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 0fe4919..78615d9 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -760,8 +760,11 @@ add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DMSYS set_property(TEST RunCMake.install APPEND PROPERTY LABELS "ISPC") +if(DEFINED CMake_COMPILER_FORCES_NEW_DTAGS) + list(APPEND file-GET_RUNTIME_DEPENDENCIES_ARGS + -DCMake_COMPILER_FORCES_NEW_DTAGS=${CMake_COMPILER_FORCES_NEW_DTAGS}) +endif() add_RunCMake_test(file-GET_RUNTIME_DEPENDENCIES - -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID} -DCMake_INSTALL_NAME_TOOL_BUG=${CMake_INSTALL_NAME_TOOL_BUG} ) diff --git a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake index 75bfc07..43b406b 100644 --- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake +++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake @@ -59,7 +59,7 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(ENV{LDFLAGS} "${new_ldflags}") endif() - if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL") + if(NOT CMake_COMPILER_FORCES_NEW_DTAGS) run_install_test(linux) run_install_test(linux-parent-rpath-propagation) run_install_test(file-filter) |