rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: dist needs to know mac sdk used

This commit is contained in:
Nick Bolton 2014-02-14 16:54:32 +00:00
parent bf361d153b
commit b385a459ad
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/build/toolchain.py
View File

@ -66,7 +66,7 @@ class InternalCommands:
# by default, compile the gui # by default, compile the gui
enableMakeGui = True enableMakeGui = True
# by default, let cmake decide # by default, unknown
macSdk = None macSdk = None
# cryptoPP dir with version number # cryptoPP dir with version number
@ -206,10 +206,9 @@ class InternalCommands:
cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize() cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
elif sys.platform == "darwin": elif sys.platform == "darwin":
path = "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk/" sdkDir = self.getMacSdkDir()
cmake_args += " -DCMAKE_OSX_SYSROOT=" + path cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
os.environ["MACOSX_DEPLOYMENT_TARGET"] = self.macSdk
# store the sdk version for the build command # store the sdk version for the build command
config = self.getConfig() config = self.getConfig()
@ -399,8 +398,8 @@ class InternalCommands:
config = self.getConfig() config = self.getConfig()
if config.has_option("cmake", "mac_sdk"): if config.has_option("cmake", "mac_sdk"):
macSdk = config.get("cmake", "mac_sdk") self.macSdk = config.get("cmake", "mac_sdk")
os.environ["MACOSX_DEPLOYMENT_TARGET"] = macSdk os.environ["MACOSX_DEPLOYMENT_TARGET"] = self.macSdk
if generator.find('Unix Makefiles') != -1: if generator.find('Unix Makefiles') != -1:
for target in targets: for target in targets:
@ -416,6 +415,7 @@ class InternalCommands:
raise Exception('Build command not supported with generator: ' + generator) raise Exception('Build command not supported with generator: ' + generator)
def makeGui(self, targets, args=""): def makeGui(self, targets, args=""):
if sys.platform == 'win32': if sys.platform == 'win32':
gui_make_cmd = self.w32_make_cmd gui_make_cmd = self.w32_make_cmd
elif sys.platform in ['linux2', 'sunos5', 'freebsd7', 'darwin']: elif sys.platform in ['linux2', 'sunos5', 'freebsd7', 'darwin']:
@ -730,6 +730,11 @@ class InternalCommands:
raise Exception('Package failed: ' + str(err)) raise Exception('Package failed: ' + str(err))
def distMac(self): def distMac(self):
config = self.getConfig()
if config.has_option("cmake", "mac_sdk"):
self.macSdk = config.get("cmake", "mac_sdk")
dir = self.getGenerator().binDir dir = self.getGenerator().binDir
name = "Synergy" name = "Synergy"
dist = dir + "/" + name dist = dir + "/" + name