This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5699 Add Mac deploy argument in configure command

If deploy target is not specified, it would use the specified sdk
version
  • Loading branch information...
XinyuHou committed Oct 31, 2016
1 parent 6a7703f commit 340ee43d90a87ba35375da106315a69c8baf0cfe
Showing with 17 additions and 4 deletions.
  1. +17 −4 ext/toolchain/commands1.py
View
@@ -41,7 +41,7 @@ class Toolchain:
cmd_opt_dict = {
'about' : ['', []],
'setup' : ['g:', ['generator=']],
- 'configure' : ['g:dr', ['generator=', 'debug', 'release', 'mac-sdk=', 'mac-identity=']],
+ 'configure' : ['g:dr', ['generator=', 'debug', 'release', 'mac-sdk=', 'mac-deploy=', 'mac-identity=']],
'build' : ['dr', ['debug', 'release']],
'clean' : ['dr', ['debug', 'release']],
'update' : ['', []],
@@ -244,6 +244,9 @@ class InternalCommands:
# by default, unknown
macSdk = None
+ # by default, unknown
+ macDeploy = None
+
# by default, unknown
macIdentity = None
@@ -365,7 +368,7 @@ def configure(self, target='', extraArgs=''):
# ensure latest setup and do not ask config for generator (only fall
# back to prompt if not specified as arg)
self.ensure_setup_latest()
-
+
if sys.platform == "darwin":
config = self.getConfig()
@@ -374,6 +377,11 @@ def configure(self, target='', extraArgs=''):
elif config.has_option("hm", "macSdk"):
self.macSdk = config.get('hm', 'macSdk')
+ if self.macDeploy:
+ config.set('hm', 'macDeploy', self.macDeploy)
+ elif config.has_option("hm", "macDeploy"):
+ self.macSdk = config.get('hm', 'macDeploy')
+
if self.macIdentity:
config.set('hm', 'macIdentity', self.macIdentity)
elif config.has_option("hm", "macIdentity"):
@@ -383,7 +391,10 @@ def configure(self, target='', extraArgs=''):
if not self.macSdk:
raise Exception("Arg missing: --mac-sdk <version>");
-
+
+ if not self.macDeploy:
+ self.macDeploy = self.macSdk
+
if not self.macIdentity:
raise Exception("Arg missing: --mac-identity <name>");
@@ -438,7 +449,7 @@ def configureCore(self, target="", extraArgs=""):
if generator.cmakeName.find('Unix Makefiles') == -1:
sdkDir = self.getMacSdkDir()
cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
- cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
+ cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macDeploy
cmake_args += " -DOSX_TARGET_MAJOR=" + macSdkMatch.group(1)
cmake_args += " -DOSX_TARGET_MINOR=" + macSdkMatch.group(2)
@@ -1898,6 +1909,8 @@ def __init__(self, argv, opts, args, verbose):
self.qtDir = a
elif o == '--mac-sdk':
self.ic.macSdk = a
+ elif o == '--mac-deploy':
+ self.ic.macDeploy = a
elif o == '--mac-identity':
self.ic.macIdentity = a

0 comments on commit 340ee43

Please sign in to comment.