diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-26 12:32:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-26 12:32:58 (GMT) |
| commit | ba1dc990989565f227f20e6a9b45f58fb7f11e26 (patch) | |
| tree | 4ba9850e56bd0688bfba6d0857aafe4fdf6b5b5a /Tests | |
| parent | cf789bb447274b6889fd631769894d69cc1b597b (diff) | |
| parent | cc4e30480025d942bcedb762635295a0f768f686 (diff) | |
| download | CMake-ba1dc990989565f227f20e6a9b45f58fb7f11e26.zip CMake-ba1dc990989565f227f20e6a9b45f58fb7f11e26.tar.gz CMake-ba1dc990989565f227f20e6a9b45f58fb7f11e26.tar.bz2 | |
Merge topic 'ninja-multi-fix-macos-failures' into release-3.17
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4396
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CFBundleTest/VerifyResult.cmake | 2 | ||||
| -rw-r--r-- | Tests/CustComDepend/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/CFBundleTest/VerifyResult.cmake b/Tests/CFBundleTest/VerifyResult.cmake index e637bb1..ac14e5d 100644 --- a/Tests/CFBundleTest/VerifyResult.cmake +++ b/Tests/CFBundleTest/VerifyResult.cmake @@ -14,7 +14,7 @@ message(STATUS "CTEST_CONFIGURATION_TYPE='${CTEST_CONFIGURATION_TYPE}'") message(STATUS "dir='${dir}'") message(STATUS "gen='${gen}'") -if(gen STREQUAL "Xcode") +if(gen MATCHES "^(Xcode$|Ninja Multi-Config$)") set(expected_filename "${dir}/${CTEST_CONFIGURATION_TYPE}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest") else() set(expected_filename "${dir}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest") diff --git a/Tests/CustComDepend/CMakeLists.txt b/Tests/CustComDepend/CMakeLists.txt index 46276b2..777cdcc 100644 --- a/Tests/CustComDepend/CMakeLists.txt +++ b/Tests/CustComDepend/CMakeLists.txt @@ -6,9 +6,9 @@ set(EXECUTABLE_OUTPUT_PATH ${CustComDepend_BINARY_DIR}/bin) add_executable(foo foo.cxx) add_custom_command( OUTPUT ${CustComDepend_BINARY_DIR}/bar.c - COMMAND ${CustComDepend_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/foo + COMMAND $<TARGET_FILE:foo> ${CustComDepend_BINARY_DIR}/bar.c - DEPENDS ${CustComDepend_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/foo + DEPENDS $<TARGET_FILE:foo> ) add_library(bar SHARED ${CustComDepend_BINARY_DIR}/bar.c) |