diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-29 13:50:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-29 13:50:29 (GMT) |
| commit | 55465be8404d37713c4bece1cc20acb3a7165492 (patch) | |
| tree | 4033d5e4c35e70ff19516c8ad98fc6204853bc38 /Modules | |
| parent | 1ac89a4e06f73a5e460f21866b3b28c2f8af31d9 (diff) | |
| parent | fe34a5c82b68bbaec8f4aa5604d9cefa4aca2d33 (diff) | |
| download | CMake-55465be8404d37713c4bece1cc20acb3a7165492.zip CMake-55465be8404d37713c4bece1cc20acb3a7165492.tar.gz CMake-55465be8404d37713c4bece1cc20acb3a7165492.tar.bz2 | |
Merge topic '16961-xctest-scheme'
fe34a5c8 Xcode: Add XCTest support to schema generator
690cf2c1 Xcode: Prepare schema generator for XCTest
ff3498e7 XCTest: Speed up test by only enabling C language
610d2fce XCTest: Use bundle specific generator expressions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1013
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindXCTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake index ffdf677..8497336 100644 --- a/Modules/FindXCTest.cmake +++ b/Modules/FindXCTest.cmake @@ -136,7 +136,7 @@ function(xctest_add_bundle target testee) XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>") if(NOT XCODE_VERSION VERSION_LESS 7.3) set_target_properties(${target} PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:${testee}>/../PlugIns") + LIBRARY_OUTPUT_DIRECTORY "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>/PlugIns") endif() else(XCODE) target_link_libraries(${target} @@ -183,7 +183,7 @@ function(xctest_add_test name bundle) add_test( NAME ${name} - COMMAND ${XCTest_EXECUTABLE} $<TARGET_LINKER_FILE_DIR:${bundle}>/../..) + COMMAND ${XCTest_EXECUTABLE} $<TARGET_BUNDLE_DIR:${bundle}>) # point loader to testee in case rpath is disabled |