diff --git a/CMakeLists.txt b/CMakeLists.txt index b2e7aa3d9..62bf4eb71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/gtsam/3rdparty/CMakeLists.txt b/gtsam/3rdparty/CMakeLists.txt index 38c084e25..64636d262 100644 --- a/gtsam/3rdparty/CMakeLists.txt +++ b/gtsam/3rdparty/CMakeLists.txt @@ -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: diff --git a/gtsam/inference/MetisIndex.h b/gtsam/inference/MetisIndex.h index 684755895..ff67a5e21 100644 --- a/gtsam/inference/MetisIndex.h +++ b/gtsam/inference/MetisIndex.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include namespace gtsam { diff --git a/gtsam/inference/Ordering.cpp b/gtsam/inference/Ordering.cpp index 81f9ddb5c..5ae25d543 100644 --- a/gtsam/inference/Ordering.cpp +++ b/gtsam/inference/Ordering.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include using namespace std;