diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-10 01:53:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-10 01:53:37 +0400 |
| commit | b2e9fffc3dce95b6dffb9b01aa4527aed5cffa4f (patch) | |
| tree | dade7bf7b38f37c68d7a4270ddfe02e92b6ca68c /SConstruct | |
| parent | f0c06e71baa1dc11f98d657636822686f4b15df9 (diff) | |
Further tweaks to SCons's auto tests
We should do autotests only after setting path to sconsign,
otherwise using the same working directory and different
build directories will eventually break.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index bcc1a4ba4ec..8e310c68c90 100644 --- a/SConstruct +++ b/SConstruct @@ -595,16 +595,6 @@ if not os.path.isdir ( B.root_build_dir): # if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']: # os.makedirs ( B.doc_build_dir ) -# Put all auto configuration run-time tests here - -from FindSharedPtr import FindSharedPtr -from FindUnorderedMap import FindUnorderedMap - -conf = Configure(env) -conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS']) -FindSharedPtr(conf) -FindUnorderedMap(conf) -env = conf.Finish() ################################### # Ensure all data files are valid # @@ -787,6 +777,19 @@ B.init_lib_dict() ##### END SETUP ########## +# Put all auto configuration run-time tests here + +from FindSharedPtr import FindSharedPtr +from FindUnorderedMap import FindUnorderedMap + +conf = Configure(env) +conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS']) +FindSharedPtr(conf) +FindUnorderedMap(conf) +env = conf.Finish() + +# End of auto configuration + Export('env') VariantDir(B.root_build_dir+'/source', 'source', duplicate=0) |