From 28b740eb8da7048c27012546038074ad21b623ce Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 1 Aug 2022 15:06:15 -0400 Subject: [PATCH 1/2] fix matlab compilation --- gtsam/basis/basis.i | 2 +- gtsam/geometry/geometry.i | 8 ++++---- gtsam/nonlinear/nonlinear.i | 2 +- matlab/CMakeLists.txt | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gtsam/basis/basis.i b/gtsam/basis/basis.i index a6c9d87ee7..0cd87ba65d 100644 --- a/gtsam/basis/basis.i +++ b/gtsam/basis/basis.i @@ -137,7 +137,7 @@ class FitBasis { static gtsam::GaussianFactorGraph::shared_ptr LinearGraph( const std::map& sequence, const gtsam::noiseModel::Base* model, size_t N); - This::Parameters parameters() const; + gtsam::This::Parameters parameters() const; }; } // namespace gtsam diff --git a/gtsam/geometry/geometry.i b/gtsam/geometry/geometry.i index 4ebff6c03a..1b1169d2f0 100644 --- a/gtsam/geometry/geometry.i +++ b/gtsam/geometry/geometry.i @@ -1126,10 +1126,10 @@ class TriangulationResult { Status status; TriangulationResult(const gtsam::Point3& p); const gtsam::Point3& get() const; - static TriangulationResult Degenerate(); - static TriangulationResult Outlier(); - static TriangulationResult FarPoint(); - static TriangulationResult BehindCamera(); + static gtsam::TriangulationResult Degenerate(); + static gtsam::TriangulationResult Outlier(); + static gtsam::TriangulationResult FarPoint(); + static gtsam::TriangulationResult BehindCamera(); bool valid() const; bool degenerate() const; bool outlier() const; diff --git a/gtsam/nonlinear/nonlinear.i b/gtsam/nonlinear/nonlinear.i index 4bb80a0d62..55966ee840 100644 --- a/gtsam/nonlinear/nonlinear.i +++ b/gtsam/nonlinear/nonlinear.i @@ -701,7 +701,7 @@ class ISAM2Result { /** Getters and Setters for all properties */ size_t getVariablesRelinearized() const; size_t getVariablesReeliminated() const; - FactorIndices getNewFactorsIndices() const; + gtsam::FactorIndices getNewFactorsIndices() const; size_t getCliques() const; double getErrorBefore() const; double getErrorAfter() const; diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt index b83bf1f0fe..a77db06a45 100644 --- a/matlab/CMakeLists.txt +++ b/matlab/CMakeLists.txt @@ -99,7 +99,6 @@ endif(GTSAM_UNSTABLE_INSTALL_MATLAB_TOOLBOX) # Record the root dir for gtsam - needed during external builds, e.g., ROS set(GTSAM_SOURCE_ROOT_DIR ${GTSAM_SOURCE_DIR}) -message(STATUS "GTSAM_SOURCE_ROOT_DIR: [${GTSAM_SOURCE_ROOT_DIR}]") # Tests message(STATUS "Installing Matlab Toolbox") install_matlab_scripts("${GTSAM_SOURCE_ROOT_DIR}/matlab/" "*.m;*.fig") From 9ec762b76dcd1d956e5acf4d397e756a3aeff636 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 1 Aug 2022 15:06:36 -0400 Subject: [PATCH 2/2] print boost version --- cmake/HandlePrintConfiguration.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/HandlePrintConfiguration.cmake b/cmake/HandlePrintConfiguration.cmake index 43ee5b57b4..04d27c27f4 100644 --- a/cmake/HandlePrintConfiguration.cmake +++ b/cmake/HandlePrintConfiguration.cmake @@ -33,6 +33,7 @@ print_build_options_for_target(gtsam) print_config("Use System Eigen" "${GTSAM_USE_SYSTEM_EIGEN} (Using version: ${GTSAM_EIGEN_VERSION})") print_config("Use System Metis" "${GTSAM_USE_SYSTEM_METIS}") +print_config("Using Boost version" "${Boost_VERSION}") if(GTSAM_USE_TBB) print_config("Use Intel TBB" "Yes (Version: ${TBB_VERSION})")