diff options
| author | Brad King <brad.king@kitware.com> | 2024-06-14 13:23:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-06-14 13:23:29 (GMT) |
| commit | 5a37d2f7348a16bfae4862b6ba3391b61fd38c4c (patch) | |
| tree | a0047a9ca0d6bb370d32507df389f3aeb59dc5ba | |
| parent | aecdab38338346be61ccf206390d675c54d2613d (diff) | |
| parent | b243c19986c0fb5837687a75b937d559f533310c (diff) | |
| download | CMake-5a37d2f7348a16bfae4862b6ba3391b61fd38c4c.zip CMake-5a37d2f7348a16bfae4862b6ba3391b61fd38c4c.tar.gz CMake-5a37d2f7348a16bfae4862b6ba3391b61fd38c4c.tar.bz2 | |
Merge topic 'xcode-16' into release-3.30
b243c19986 Tests: Update expected results for Xcode 16
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9596
| -rw-r--r-- | Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt b/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt index b4afc27..ea3b5c1 100644 --- a/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt +++ b/Tests/RunCMake/CMP0156/CMP0156-OLD-AppleClang-build-stdout.txt @@ -1,3 +1,3 @@ ld: warning: ignoring duplicate libraries: '.*liblib1.a', '.*liblib2.a' ld: fatal warning\(s\) induced error \(-fatal_warnings\) -clang: error: linker command failed with exit code 1 \(use -v to see invocation\) +(cc|clang): error: linker command failed with exit code 1 \(use -v to see invocation\) diff --git a/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake b/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake index c57e727..77ab874 100644 --- a/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake +++ b/Tests/RunCMake/LinkerSelection/RunCMakeTest.cmake @@ -17,8 +17,9 @@ macro(run_cmake_and_build test) -DCMake_TEST_Swift=${CMake_TEST_Swift}) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build) set(RunCMake_TEST_NO_CLEAN 1) + set(RunCMake_TEST_OUTPUT_MERGE 1) run_cmake_command(${test}-build ${CMAKE_COMMAND} --build . --config Release --verbose ${ARGN}) - + unset(RunCMake_TEST_OUTPUT_MERGE) unset(RunCMake_TEST_BINARY_DIR) unset(RunCMake_TEST_NO_CLEAN) endmacro() |