Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-03-30 11:11:08 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-30 11:11:08 +0300
commit59740a6c985efbf5369d27a5919e184036d0287a (patch)
treea350ab5cd8c893d74c4ef6605325e48ace92b7c4 /SConstruct
parent23c0e46a003c491bbcafc8c42eace83fc95f3974 (diff)
SCons: cudakernels now depends on some configuration tests
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct28
1 files changed, 15 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct
index 52fef2f3b87..7cdc4b35206 100644
--- a/SConstruct
+++ b/SConstruct
@@ -871,19 +871,21 @@ B.init_lib_dict()
##### END SETUP ##########
-if B.targets != ['cudakernels']:
- # Put all auto configuration run-time tests here
-
- from FindSharedPtr import FindSharedPtr
- from FindUnorderedMap import FindUnorderedMap
-
- conf = Configure(env)
- old_linkflags = conf.env['LINKFLAGS']
- conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
- FindSharedPtr(conf)
- FindUnorderedMap(conf)
- conf.env['LINKFLAGS'] = old_linkflags
- env = conf.Finish()
+## Auto-configuration run-time tests
+
+from FindSharedPtr import FindSharedPtr
+from FindUnorderedMap import FindUnorderedMap
+
+conf = Configure(env)
+old_linkflags = conf.env['LINKFLAGS']
+conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
+
+# Put all tests here
+FindSharedPtr(conf)
+FindUnorderedMap(conf)
+
+conf.env['LINKFLAGS'] = old_linkflags
+env = conf.Finish()
# End of auto configuration