dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-03 22:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'install-name-tool-bug'

Browse Source 
162e8aeb9e Tests: Disable test on problematic versions of install_name_tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4276
This commit is contained in:
Brad King
2020-01-28 15:46:03 +00:00
committed by Kitware Robot
parent 03e2757c66 162e8aeb9e
commit d6028df6a5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/RunCMake/CMakeLists.txt
View File

@@ -473,7 +473,9 @@ add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DCMAK
-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})
-DCMAKE_EXECUTABLE_FORMAT=${CMAKE_EXECUTABLE_FORMAT}
-DCMake_INSTALL_NAME_TOOL_BUG=${CMake_INSTALL_NAME_TOOL_BUG}
)
add_RunCMake_test(CPackCommandLine)
add_RunCMake_test(CPackConfig)

10
Tests/RunCMake/install/RunCMakeTest.cmake
View File

@@ -156,10 +156,12 @@ run_install_test(TARGETS-RPATH)
run_install_test(InstallRequiredSystemLibraries)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-unresolved)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-conflict)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-notfile)
if(NOT CMake_INSTALL_NAME_TOOL_BUG)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-unresolved)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-conflict)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-notfile)
endif()
run_cmake(file-GET_RUNTIME_DEPENDENCIES-project)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)