summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-04-13 13:05:10 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-04-13 13:05:10 (GMT)
commit9d1ba6d0f53a4ccf169431ceb9eb68cc098aa32a (patch)
treea49489424b726e9d5ce3d9247bd443e989a1c5c7
parent9a101b6754d058d9175c172391ca1b3bfa34fbe3 (diff)
parentc9e9c31c53f69475aa080ad442492408217259b5 (diff)
downloadCMake-9d1ba6d0f53a4ccf169431ceb9eb68cc098aa32a.zip
CMake-9d1ba6d0f53a4ccf169431ceb9eb68cc098aa32a.tar.gz
CMake-9d1ba6d0f53a4ccf169431ceb9eb68cc098aa32a.tar.bz2
Merge topic 'emulator-property'
c9e9c31c Tests: Create pseudo_emulator output dir for Xcode 2.x
-rw-r--r--Tests/RunCMake/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d7ac81d..d5f1d22 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -232,3 +232,11 @@ endif()
add_executable(pseudo_emulator pseudo_emulator.c)
add_RunCMake_test(CrosscompilingEmulator
-DPSEUDO_EMULATOR=$<TARGET_FILE:pseudo_emulator>)
+# 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_emulator
+ PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
+ )
+endif()