Commit c59aae5b authored by Laurent Belcour's avatar Laurent Belcour

Updating configuration scripts for scons.

parent 8d31f233
......@@ -58,7 +58,7 @@ QUADPROG_LIB = ['quadprog++']
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
## NlOpt library
......
......@@ -62,7 +62,7 @@ QUADPROG_LIB = ['quadprog++']
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas']
CERES_OPT_LIB = ['lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
## NlOpt library
......
......@@ -58,7 +58,7 @@ QUADPROG_LIB = ['quadprog++']
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
## NlOpt library
......
......@@ -12,8 +12,10 @@ conf = Configure(env)
if conf.CheckLibWithHeader(env['CERES_LIB'], 'ceres/ceres.h', 'c++'):
if conf.CheckLib(env['CERES_OPT_LIB']):
env.AppendUnique(LIBS = env['CERES_OPT_LIB'])
for lib in env['CERES_OPT_LIB']:
if conf.CheckLib(lib):
env.AppendUnique(LIBS = lib)
#end
#end
build_lib = True
......@@ -24,4 +26,4 @@ env = conf.Finish()
if build_lib:
sources = ['fitter.cpp']
env.SharedLibrary('../../build/nonlinear_fitter_ceres', sources)
#end
\ No newline at end of file
#end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment