Merge topic 'fix-CTestTestMemcheck-xcode2-missing-dirs'
27b81213
Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
This commit is contained in:
commit
c53e82093f
|
@ -19,14 +19,6 @@ add_executable(pseudo_valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.cxx")
|
|||
set_target_properties(pseudo_valgrind PROPERTIES OUTPUT_NAME valgrind)
|
||||
target_link_libraries(pseudo_valgrind CMakeLib)
|
||||
|
||||
# Xcode 2.x forgets to create the output directory before linking
|
||||
# the individual architectures.
|
||||
if(CMAKE_OSX_ARCHITECTURES AND XCODE AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
|
||||
add_custom_command(TARGET pseudo_valgrind
|
||||
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
|
||||
)
|
||||
endif()
|
||||
|
||||
add_executable(pseudo_purify "${CMAKE_CURRENT_BINARY_DIR}/ret0.cxx")
|
||||
set_target_properties(pseudo_purify PROPERTIES OUTPUT_NAME purify)
|
||||
target_link_libraries(pseudo_purify CMakeLib)
|
||||
|
@ -196,3 +188,18 @@ set_tests_properties(CTestTestMemcheckDummyValgrindCustomOptions PROPERTIES
|
|||
set_tests_properties(CTestTestMemcheckDummyValgrindTwoTargets PROPERTIES
|
||||
PASS_REGULAR_EXPRESSION
|
||||
"\nMemory check project ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindTwoTargets\n.*\n *Start 1: RunCMake\n(.*\n)?Memory check command: .* \"--log-file=${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindTwoTargets/Testing/Temporary/MemoryChecker.1.log\" \"-q\".*\n *Start 2: RunCMakeAgain\n(.*\n)?Memory check command: .* \"--log-file=${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindTwoTargets/Testing/Temporary/MemoryChecker.2.log\" \"-q\".*\n")
|
||||
|
||||
# Xcode 2.x forgets to create the output directory before linking
|
||||
# the individual architectures.
|
||||
if(CMAKE_OSX_ARCHITECTURES AND XCODE AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
|
||||
foreach(t
|
||||
memcheck_fail
|
||||
pseudo_BC
|
||||
pseudo_purify
|
||||
pseudo_valgrind
|
||||
)
|
||||
add_custom_command(TARGET ${t}
|
||||
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
|
||||
)
|
||||
endforeach()
|
||||
endif()
|
||||
|
|
|
@ -11,12 +11,12 @@ configure_file(
|
|||
foreach(_pseudo IN ITEMS valgrind purify BC)
|
||||
add_executable(pseudonl_${_pseudo} "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
|
||||
set_target_properties(pseudonl_${_pseudo} PROPERTIES OUTPUT_NAME ${_pseudo})
|
||||
endforeach()
|
||||
|
||||
# Xcode 2.x forgets to create the output directory before linking
|
||||
# the individual architectures.
|
||||
if(CMAKE_OSX_ARCHITECTURES AND XCODE AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
|
||||
add_custom_command(TARGET pseudonl_valgrind
|
||||
add_custom_command(TARGET pseudonl_${_pseudo}
|
||||
PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
|
||||
)
|
||||
endif()
|
||||
endforeach()
|
||||
|
|
Loading…
Reference in New Issue