From c3f38349b444b490a864955008fdffc8b8e2f68b Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Sun, 28 Oct 2012 20:48:17 +0000 Subject: [PATCH] Fixed include paths for matlab modules --- gtsam.h | 2 +- gtsam/CMakeLists.txt | 2 +- gtsam_unstable/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam.h b/gtsam.h index 48a86e248..3925dff73 100644 --- a/gtsam.h +++ b/gtsam.h @@ -901,7 +901,7 @@ class SymbolicFactorGraph { void push_factor(size_t key1, size_t key2, size_t key3, size_t key4); pair eliminateFrontals(size_t nFrontals) const; - pair eliminateOne(size_t j) const; + pair eliminateOne(size_t j); }; #include diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 054664940..42a5d2599 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -131,7 +131,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX) set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # 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 # FIXME: issue with dependency between wrap_gtsam and wrap_gtsam_build, only shows up on CMake 2.8.3 diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index c38015db9..9d3d0e643 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -91,7 +91,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX) set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) # 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 wrap_library(gtsam_unstable "${mexFlags}" "./" gtsam)