[Bf-blender-cvs] [59740a6] master: SCons: cudakernels now depends on some configuration tests

Sergey Sharybin noreply at git.blender.org
Mon Mar 30 10:12:10 CEST 2015


Commit: 59740a6c985efbf5369d27a5919e184036d0287a
Author: Sergey Sharybin
Date:   Mon Mar 30 13:11:08 2015 +0500
Branches: master
https://developer.blender.org/rB59740a6c985efbf5369d27a5919e184036d0287a

SCons: cudakernels now depends on some configuration tests

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index 52fef2f..7cdc4b3 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




More information about the Bf-blender-cvs mailing list