浏览代码

XCTest: Use bundle specific generator expressions

Gregor Jasny 8 年之前
父节点
当前提交
610d2fcec0
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Modules/FindXCTest.cmake

+ 2 - 2
Modules/FindXCTest.cmake

@@ -136,7 +136,7 @@ function(xctest_add_bundle target testee)
         XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
         XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
       if(NOT XCODE_VERSION VERSION_LESS 7.3)
       if(NOT XCODE_VERSION VERSION_LESS 7.3)
         set_target_properties(${target} PROPERTIES
         set_target_properties(${target} PROPERTIES
-          LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:${testee}>/../PlugIns")
+          LIBRARY_OUTPUT_DIRECTORY "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>/PlugIns")
       endif()
       endif()
     else(XCODE)
     else(XCODE)
       target_link_libraries(${target}
       target_link_libraries(${target}
@@ -183,7 +183,7 @@ function(xctest_add_test name bundle)
 
 
   add_test(
   add_test(
     NAME ${name}
     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
   # point loader to testee in case rpath is disabled