Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit d497acce authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Updating scons tools.

parent 555ba3c2
......@@ -99,7 +99,7 @@ Export('env')
external = env.SConscript('external/SConscript')
core = env.SConscript('sources/core/SConscript')
plugins = env.SConscript('sources/plugins/SConscript')
#plugins = env.SConscript('sources/plugins/SConscript')
softs = env.SConscript('sources/softs/SConscript')
#sources = env.SConscript('sources/SConscript')
#env.Depends(sources, external)
\ No newline at end of file
#env.Depends(sources, external)
......@@ -3,7 +3,11 @@ import os, sys
##----------------------------------------------------------------##
## This file describes required and optional arguments to ALTA ##
## compilation. If you want to manualy tune the use of an already ##
## present library, uncomment the according lines. ##
## present library, update the according lines ##
## ##
## This configuration file is made of a MacOS X operating system ##
## version 10.9, with clang and OpenEXR and FLANN libraries ##
## installed using Ports. ##
##----------------------------------------------------------------##
......@@ -18,7 +22,7 @@ LINKFLAGS = []
##
CORE_LIB = ['dl']
SOFT_LIB = ['core', 'dl']
PLUGINS_LIB = ['core']
PLUGIN_LIB = ['core']
## OpenMP flags
......@@ -29,15 +33,15 @@ OPENMP_LIB = []
## OpenEXR library
##
OPENEXR_INC = ['/usr/include/OpenEXR']
OPENEXR_DIR = ['/usr/lib']
OPENEXR_INC = ['/opt/local/include/OpenEXR']
OPENEXR_DIR = ['/opt/local/lib']
OPENEXR_LIB = ['Half', 'IlmImf', 'IlmThread']
## FLANN library
##
FLANN_INC = ['/usr/include/flann']
FLANN_DIR = ['/usr/lib/x86_64_linux-gnu']
FLANN_INC = ['/opt/local/include']
FLANN_DIR = ['/opt/local/lib']
FLANN_LIB = ['flann']
......
......@@ -8,14 +8,14 @@ if env.GetOption('clean'):
print "Removing all the third party packages"
# Removing the output build directory
shutil.rmtree('build', True)
#shutil.rmtree('build', True)
# Removing the TP directories
shutil.rmtree('ceres-solver-1.7.0', True)
shutil.rmtree('eigen-eigen-ffa86ffb5570', True)
shutil.rmtree('glog-0.3.3', True)
shutil.rmtree('Ipopt-3.11.8', True)
shutil.rmtree('nlopt-2.4.1', True)
#shutil.rmtree('ceres-solver-1.7.0', True)
#shutil.rmtree('eigen-eigen-ffa86ffb5570', True)
#shutil.rmtree('glog-0.3.3', True)
#shutil.rmtree('Ipopt-3.11.8', True)
#shutil.rmtree('nlopt-2.4.1', True)
else:
##
......
......@@ -19,8 +19,8 @@ env.AppendUnique(env['CORE_LIB'])
## on OSX, the shared libraries and the softwares cannot share vtables. This
## impact the use of dynamic_cast in shared libraries.
##
if sys.platform == 'darwin':
env.AppendUnique(CCFLAGS = '-fvisibility=hidden')
#if sys.platform == 'darwin':
# env.AppendUnique(CCFLAGS = '-fvisibility=hidden')
#end
env.StaticLibrary('../build/core', sources)
\ No newline at end of file
env.StaticLibrary('../build/core', sources)
......@@ -2,7 +2,7 @@ Import('env')
env = env.Clone()
conf = Configure(env)
if conf.CheckLib(env['FLANN_LIB']):
if conf.CheckLibWithHeader(env['FLANN_LIB'], 'flann/flann.hpp', 'CXX'):
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
env.AppendUnique(LIBS = env['FLANN_LIB'])
......
Import('env')
env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
env.AppendUnique(LIBS = env['CERES_LIB'])
env.AppendUnique(LIBPATH = env['CERES_DIR'])
env.AppendUnique(CPPPATH = env['CERES_INC'])
conf = Configure(env)
if conf.CheckLib(env['CERES_LIB']):
if conf.CheckLibWithHeader(env['CERES_LIB'], 'ceres/ceres.h', 'c++'):
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
env.AppendUnique(LIBS = env['CERES_LIB'])
env.AppendUnique(LIBPATH = env['CERES_DIR'])
env.AppendUnique(CPPPATH = env['CERES_INC'])
if conf.CheckLib(env['CERES_OPT_LIB']):
env.AppendUnique(LIBS = env['CERES_OPT_LIB'])
#end
......@@ -18,4 +19,4 @@ if conf.CheckLib(env['CERES_LIB']):
#end
env = conf.Finish()
\ No newline at end of file
env = conf.Finish()
......@@ -3,5 +3,13 @@ env = env.Clone()
env.AppendUnique(LIBS = env['PLUGIN_LIB'])
sources = ['fitter.cpp']
env.SharedLibrary('../../build/nonlinear_fitter_eigen', sources)
\ No newline at end of file
conf = Configure(env)
if conf.CheckCXXHeader('unsupported/Eigen/LevenbergMarquardt'):
sources = ['fitter.cpp']
env.SharedLibrary('../../build/nonlinear_fitter_eigen', sources)
#end
env = conf.Finish()
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