Update Ceres to latest upstream version
Brings new bounds limiting and also prepares build system for the changes in the upstream. Namely shared_ptr header and namespace is now being detected by a build system rather than by hacks in the code. This commit includes some changes to auto-detection flags in SCons, presumably adding more consistency there. This is main changes which are suppoed to be reviewed here. Reviewers: campbellbarton Differential Revision: https://developer.blender.org/D581
This commit is contained in:
16
SConstruct
16
SConstruct
@@ -40,11 +40,13 @@ import string
|
||||
import shutil
|
||||
import re
|
||||
|
||||
# store path to tools
|
||||
# store path to tools and modules
|
||||
toolpath=os.path.join(".", "build_files", "scons", "tools")
|
||||
modulespath=os.path.join(".", "build_files", "scons", "Modules")
|
||||
|
||||
# needed for importing tools
|
||||
# needed for importing tools and modules
|
||||
sys.path.append(toolpath)
|
||||
sys.path.append(modulespath)
|
||||
|
||||
import Blender
|
||||
import btools
|
||||
@@ -176,6 +178,16 @@ 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):
|
||||
|
Reference in New Issue
Block a user