FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-26 03:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Switched over to use tmp_use_seen istead of link_framework

Browse Source
This commit is contained in:
Simon 2015-07-11 16:04:10 +02:00
parent b8330b29cb
commit 6891ebb7c9
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demos/xcode/wscript
View File

@ -14,6 +14,7 @@ def configure(conf):
conf.env.SDKROOT = 'macosx10.9'
conf.env.PRODUCT_NAME = '$(TARGET_NAME)'
def build(bld):
bld.load('cxx')
tg = bld(
@ -34,12 +35,11 @@ def build(bld):
includes=tg.includes,
target='MyApp',
target_type='app',
link_framework=['MyLib'],
use='MyLib Olle',
use='MyLib',
settings={"Debug": {"CONFIG_NAME": 'Debug'}}
)
# print tg2.env
#tg2.propagate_uselib_vars()
# print tg2.tmp_use_seen
# tg2.process_use()
# print bld.get_targets()

22
waflib/extras/xcode.py
View File

@ -357,6 +357,7 @@ class PBXProject(XCodeNode):
# self._output = {}
def create_target_dependency(self, target, name):
""" : param target : PXBNativeTarget """
proxy = PBXContainerItemProxy(self, target, name)
dependecy = PBXTargetDependency(target, proxy)
return dependecy
@ -385,10 +386,6 @@ class PBXProject(XCodeNode):
def add_target(self, target):
self.targets.append(target)
# Collect all targets the project produces. If any other target
# depends on this target, we can retreive it from here later.
# self._output[target.name] = target
def get_target(self, name):
for t in self.targets:
if t.name == name:
@ -418,10 +415,7 @@ class xcode(Build.BuildContext):
return group
def get_target(self, name):
for tg in self.get_all_task_gen():
if tg.name == name:
return tg
return None
return self.get_tgen_by_name(name)
def execute(self):
"""
@ -495,13 +489,13 @@ class xcode(Build.BuildContext):
target_group.children.append(g)
# Check if any framework to link against is some other target we've made
framework = getattr(tg, 'link_framework', [])
for fw in framework:
use_target = p.get_target(fw)
libs = getattr(tg, 'tmp_use_seen', [])
print tg.tmp_use_seen
for lib in libs:
use_target = p.get_target(lib)
if use_target:
# Target framework found. Make a build file of it
# Create an XCode dependency so that XCode knows to build that framework before this target
# Target libs found. Make a build file of it
# Create an XCode dependency so that XCode knows to build that libs before this target
target.add_dependency(p.create_target_dependency(use_target, use_target.name))
target.add_build_phase(PBXFrameworksBuildPhase([PBXBuildFile(use_target.productReference)]))