From 59740a6c985efbf5369d27a5919e184036d0287a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 30 Mar 2015 13:11:08 +0500 Subject: SCons: cudakernels now depends on some configuration tests --- SConstruct | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'SConstruct') 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 -- cgit v1.2.3