From 2fdb3f9c8f4e640772736bec7b47ae9db044db18 Mon Sep 17 00:00:00 2001 From: Stefan Fochler Date: Thu, 22 Nov 2018 15:37:40 +0100 Subject: [PATCH] Move special runpaths to xconfig for better discoverabiltiy --- BXSwiftUtils.xcconfig | 5 +++++ BXSwiftUtils.xcodeproj/project.pbxproj | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BXSwiftUtils.xcconfig b/BXSwiftUtils.xcconfig index 961564c..65785c0 100644 --- a/BXSwiftUtils.xcconfig +++ b/BXSwiftUtils.xcconfig @@ -18,3 +18,8 @@ WATCHOS_DEPLOYMENT_TARGET = 5.0 COPY_PHASE_STRIP = NO LD_DYLIB_INSTALL_NAME = @rpath CLANG_ENABLE_MODULES = YES + +// These are needed to make the tests work on both macOS and iOS + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks diff --git a/BXSwiftUtils.xcodeproj/project.pbxproj b/BXSwiftUtils.xcodeproj/project.pbxproj index 9066d42..380797f 100644 --- a/BXSwiftUtils.xcodeproj/project.pbxproj +++ b/BXSwiftUtils.xcodeproj/project.pbxproj @@ -918,8 +918,6 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = BXSwiftUtilsTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.boinx.$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -934,8 +932,6 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = BXSwiftUtilsTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.boinx.$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)"; };