diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-29 18:26:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-29 18:27:54 +0400 |
| commit | d7d9e98352d4fb6d385edbd31b0354a424fe0418 (patch) | |
| tree | cec78f5679ff7533211038680c915c8fc9edc681 /SConstruct | |
| parent | d8b0470fd0f794e7ce6bca14a075fd193cca9d8a (diff) | |
Fix compilation error on OSX+Scons
Issue was caused by OSX tweaks happening in the SConstruct
after the old location of autotest.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index bdb9b3a8bfb..134970dfdc3 100644 --- a/SConstruct +++ b/SConstruct @@ -178,16 +178,6 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'): env['OURPLATFORM'] = platform -# Put all auto configuration run-time tests here - -from FindSharedPtr import FindSharedPtr -from FindUnorderedMap import FindUnorderedMap - -conf = Configure(env) -FindSharedPtr(conf) -FindUnorderedMap(conf) -env = conf.Finish() - configfile = os.path.join("build_files", "scons", "config", platform + "-config.py") if os.path.exists(configfile): @@ -605,6 +595,16 @@ 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) +FindSharedPtr(conf) +FindUnorderedMap(conf) +env = conf.Finish() + ################################### # Ensure all data files are valid # ################################### |