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 <[email protected]>
Merge-request: !4396

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")

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)