reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 12:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'ninja-multi-fix-macos-failures'

Browse Source 
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
This commit is contained in:
Brad King 2020-02-26 12:32:49 +00:00 committed by Kitware Robot
commit 919d793842
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CFBundleTest/VerifyResult.cmake
View File

@ -14,7 +14,7 @@ message(STATUS "CTEST_CONFIGURATION_TYPE='${CTEST_CONFIGURATION_TYPE}'")
message(STATUS "dir='${dir}'") message(STATUS "dir='${dir}'")
message(STATUS "gen='${gen}'") 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") set(expected_filename "${dir}/${CTEST_CONFIGURATION_TYPE}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest")
else() else()
set(expected_filename "${dir}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest") set(expected_filename "${dir}/CFBundleTest.plugin/Contents/MacOS/CFBundleTest")

4
Tests/CustComDepend/CMakeLists.txt
View File

@ -6,9 +6,9 @@ set(EXECUTABLE_OUTPUT_PATH ${CustComDepend_BINARY_DIR}/bin)
add_executable(foo foo.cxx) add_executable(foo foo.cxx)
add_custom_command( add_custom_command(
OUTPUT ${CustComDepend_BINARY_DIR}/bar.c OUTPUT ${CustComDepend_BINARY_DIR}/bar.c
COMMAND ${CustComDepend_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/foo COMMAND $<TARGET_FILE:foo>
${CustComDepend_BINARY_DIR}/bar.c ${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) add_library(bar SHARED ${CustComDepend_BINARY_DIR}/bar.c)