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

Rename corrections

release/4.3a0
Andrew Melim 2014-11-24 17:12:41 -05:00
parent 9d3aa9c618
commit 2bc381dbb4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -266,9 +266,9 @@ include_directories(BEFORE ${Boost_INCLUDE_DIR})
include_directories(BEFORE
gtsam/3rdparty/UFconfig
gtsam/3rdparty/CCOLAMD/Include
gtsam/3rdparty/metis-5.1.0/include
gtsam/3rdparty/metis-5.1.0/libmetis
gtsam/3rdparty/metis-5.1.0/GKlib
gtsam/3rdparty/metis/include
gtsam/3rdparty/metis/libmetis
gtsam/3rdparty/metis/GKlib
${PROJECT_SOURCE_DIR}
${PROJECT_BINARY_DIR} # So we can include generated config header files
CppUnitLite)

2
gtsam/3rdparty/CMakeLists.txt vendored
View File

@ -45,7 +45,7 @@ endif()
option(GTSAM_BUILD_METIS "Build metis library" ON)
option(GTSAM_BUILD_METIS_EXECUTABLES "Build metis library executables" OFF)
if(GTSAM_BUILD_METIS)
add_subdirectory(metis-5.1.0)
add_subdirectory(metis)
endif(GTSAM_BUILD_METIS)
############ NOTE: When updating GeographicLib be sure to disable building their examples
############ and unit tests by commenting out their lines:

2
gtsam/inference/MetisIndex.h
View File

@ -25,7 +25,7 @@
#include <gtsam/base/timing.h>
#include <gtsam/inference/Key.h>
#include <gtsam/inference/FactorGraph.h>
#include <gtsam/3rdparty/metis-5.1.0/include/metis.h>
#include <gtsam/3rdparty/metis/include/metis.h>
#include <boost/bimap.hpp>
namespace gtsam {

2
gtsam/inference/Ordering.cpp
View File

@ -23,7 +23,7 @@
#include <gtsam/inference/Ordering.h>
#include <gtsam/3rdparty/CCOLAMD/Include/ccolamd.h>
#include <gtsam/3rdparty/metis-5.1.0/include/metis.h>
#include <gtsam/3rdparty/metis/include/metis.h>
using namespace std;