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 | 919d793842279cb8b0d317fa996014347eafabda (patch) | |
| tree | e050396e463627f14a3f4a75cd2af9b3207a579e | |
| parent | 4116cd759960f86df8c714390587ed103b95eec9 (diff) | |
| parent | cc4e30480025d942bcedb762635295a0f768f686 (diff) | |
| download | CMake-919d793842279cb8b0d317fa996014347eafabda.zip CMake-919d793842279cb8b0d317fa996014347eafabda.tar.gz CMake-919d793842279cb8b0d317fa996014347eafabda.tar.bz2 | |
Merge topic 'ninja-multi-fix-macos-failures'
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
| -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) |