12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed include paths for matlab modules

release/4.3a0
Alex Cunningham 2012-10-28 20:48:17 +00:00
parent cb5f186031
commit c3f38349b4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam.h
View File

@ -901,7 +901,7 @@ class SymbolicFactorGraph {
void push_factor(size_t key1, size_t key2, size_t key3, size_t key4); void push_factor(size_t key1, size_t key2, size_t key3, size_t key4);
pair<gtsam::IndexConditional*, gtsam::SymbolicFactorGraph> eliminateFrontals(size_t nFrontals) const; pair<gtsam::IndexConditional*, gtsam::SymbolicFactorGraph> eliminateFrontals(size_t nFrontals) const;
pair<gtsam::IndexConditional*, gtsam::SymbolicFactorGraph> eliminateOne(size_t j) const; pair<gtsam::IndexConditional*, gtsam::SymbolicFactorGraph> eliminateOne(size_t j);
}; };
#include <gtsam/inference/SymbolicSequentialSolver.h> #include <gtsam/inference/SymbolicSequentialSolver.h>

2
gtsam/CMakeLists.txt
View File

@ -131,7 +131,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam)
# Generate, build and install toolbox # Generate, build and install toolbox
set(mexFlags ${GTSAM_BUILD_MEX_BINARY_FLAGS} -I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT}) set(mexFlags ${GTSAM_BUILD_MEX_BINARY_FLAGS} -I${MEX_INCLUDE_ROOT} -I${Boost_INCLUDE_DIR})
# Macro to handle details of setting up targets # Macro to handle details of setting up targets
# FIXME: issue with dependency between wrap_gtsam and wrap_gtsam_build, only shows up on CMake 2.8.3 # FIXME: issue with dependency between wrap_gtsam and wrap_gtsam_build, only shows up on CMake 2.8.3

2
gtsam_unstable/CMakeLists.txt
View File

@ -91,7 +91,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable)
# Generate, build and install toolbox # Generate, build and install toolbox
set(mexFlags -I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT}) set(mexFlags -I${MEX_INCLUDE_ROOT} -I${Boost_INCLUDE_DIR})
# Macro to handle details of setting up targets # Macro to handle details of setting up targets
wrap_library(gtsam_unstable "${mexFlags}" "./" gtsam) wrap_library(gtsam_unstable "${mexFlags}" "./" gtsam)