Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 8d973601 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Fixing CERES compilation on Ubuntu. Should work on MACOS. It needs to be validated for WIN32.

parent 6186b258
......@@ -12,7 +12,7 @@ exists($${EXTERNAL_INC}/ceres/ceres.h) {
CONFIG += ceres
INCLUDEPATH += $$(ALTA)/external/build/include
LIBS += -L$$(ALTA)/external/build/lib \
-lceres -lglog -lminiglog
-lceres -lminiglog
macx {
LIBS *= -lamd -lcamd -lcolamd -lcholmod -lcxsparse
......
......@@ -57,7 +57,7 @@ QUADPROG_LIB = ['quadprog++']
##
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_LIB = ['ceres', 'miniglog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
......
......@@ -61,7 +61,7 @@ QUADPROG_LIB = ['quadprog++']
##
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_LIB = ['ceres', 'miniglog']
CERES_OPT_LIB = ['lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
......
......@@ -57,7 +57,7 @@ QUADPROG_LIB = ['quadprog++']
##
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_LIB = ['ceres', 'miniglog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas', 'amd', 'camd', 'ccolamd', 'colamd', 'cholmod', 'cxsparse']
......
......@@ -57,7 +57,7 @@ QUADPROG_LIB = ['quadprog++']
##
CERES_INC = ['#external/build/include']
CERES_DIR = ['#external/build/lib']
CERES_LIB = ['ceres', 'glog']
CERES_LIB = ['ceres', 'miniglog']
CERES_OPT_LIB = ['gomp', 'lapack', 'blas']
......
......@@ -63,7 +63,7 @@ if compile_test:
#end
#cmake_cmd = 'cmake -DGLOG_LIB=' + build_dir + 'lib' + os.sep + libname + ' -DGLOG_INCLUDE=' + build_dir + 'include -DGFLAGS=OFF ' + '-DEIGEN_INCLUDE=' + build_dir + 'include -DCMAKE_INSTALL_PREFIX=' + build_dir + ' .' + ' -DDISABLE_TR1=ON -DBUILD_EXAMPLES=OFF ' + '-DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DMINIGLOG=OFF'
cmake_cmd = 'cmake -DBUILD_SHARED_LIBS=ON -DGLOG_LIB=' + build_dir + 'lib' + ' -DGLOG_INCLUDE=' + build_dir + 'include -DGFLAGS=OFF ' + '-DEIGEN_INCLUDE=' + build_dir + 'include -DCMAKE_INSTALL_PREFIX=' + build_dir + ' .' + ' -DDISABLE_TR1=ON -DBUILD_EXAMPLES=OFF ' + '-DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DMINIGLOG=ON'
cmake_cmd = 'cmake -DBUILD_SHARED_LIBS=OFF -DGLOG_LIB=' + build_dir + 'lib' + ' -DGLOG_INCLUDE=' + build_dir + 'include -DGFLAGS=OFF ' + '-DEIGEN_INCLUDE=' + build_dir + 'include -DCMAKE_INSTALL_PREFIX=' + build_dir + ' .' + ' -DDISABLE_TR1=ON -DBUILD_EXAMPLES=OFF ' + '-DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DMINIGLOG=ON'
if os.name == 'nt':
ret = os.system(cmake_cmd + ' -G \"NMake Makefiles\"')
......
load(ceres)
load(eigen)
load(openmp)
requires(contains(CONFIG, ceres))
requires(contains(CONFIG, eigen))
......
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