Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SCons: cudakernels now depends on some configuration tests

Browse Source
This commit is contained in:
Sergey Sharybin
2015-03-30 13:11:08 +05:00
parent 23c0e46a00
commit 59740a6c98
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SConstruct
View File

@@ -871,19 +871,21 @@ B.init_lib_dict()
##### END SETUP ########## ##### END SETUP ##########
if B.targets != ['cudakernels']: ## Auto-configuration run-time tests
# Put all auto configuration run-time tests here
from FindSharedPtr import FindSharedPtr from FindSharedPtr import FindSharedPtr
from FindUnorderedMap import FindUnorderedMap from FindUnorderedMap import FindUnorderedMap
conf = Configure(env) conf = Configure(env)
old_linkflags = conf.env['LINKFLAGS'] old_linkflags = conf.env['LINKFLAGS']
conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS']) conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
FindSharedPtr(conf)
FindUnorderedMap(conf) # Put all tests here
conf.env['LINKFLAGS'] = old_linkflags FindSharedPtr(conf)
env = conf.Finish() FindUnorderedMap(conf)
conf.env['LINKFLAGS'] = old_linkflags
env = conf.Finish()
# End of auto configuration # End of auto configuration