From a01d479f44bff57da842bcea60c6e86daf39c469 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Wed, 29 Aug 2012 23:09:59 +0000 Subject: [PATCH 4/4] Needed to disable C++ findExampleDataFile when building matlab wrapper --- gtsam/slam/dataset.cpp | 2 ++ gtsam/slam/dataset.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gtsam/slam/dataset.cpp b/gtsam/slam/dataset.cpp index e9ec73a85..4550b418d 100644 --- a/gtsam/slam/dataset.cpp +++ b/gtsam/slam/dataset.cpp @@ -35,6 +35,7 @@ namespace fs = boost::filesystem; namespace gtsam { +#ifndef MATLAB_MEX_FILE /* ************************************************************************* */ string findExampleDataFile(const string& name) { // Search source tree and installed location @@ -63,6 +64,7 @@ string findExampleDataFile(const string& name) { INSTALLED_DATASET_DIR " named\n" + name + ", " + name + ".graph, or " + name + ".txt"); } +#endif /* ************************************************************************* */ pair load2D( diff --git a/gtsam/slam/dataset.h b/gtsam/slam/dataset.h index 7c38e13c9..8da3d6ef9 100644 --- a/gtsam/slam/dataset.h +++ b/gtsam/slam/dataset.h @@ -25,6 +25,7 @@ namespace gtsam { +#ifndef MATLAB_MEX_FILE /** * Find the full path to an example dataset distributed with gtsam. The name * may be specified with or without a file extension - if no extension is @@ -37,6 +38,7 @@ namespace gtsam { * search process described above. */ std::string findExampleDataFile(const std::string& name); +#endif /** * Load TORO 2D Graph