From 687d05405a3e5b641b0e9533b5b6d6ae6a085909 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sun, 23 Feb 2014 19:07:56 -0500 Subject: [PATCH] Disabled GeographicLib unit tests and tools --- gtsam/3rdparty/CMakeLists.txt | 7 ++++++- gtsam/3rdparty/GeographicLib/CMakeLists.txt | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gtsam/3rdparty/CMakeLists.txt b/gtsam/3rdparty/CMakeLists.txt index f06f4f769..906aaff6a 100644 --- a/gtsam/3rdparty/CMakeLists.txt +++ b/gtsam/3rdparty/CMakeLists.txt @@ -26,5 +26,10 @@ if(NOT GTSAM_USE_SYSTEM_EIGEN) endif() ############ NOTE: When updating GeographicLib be sure to disable building their examples -############ by commenting out their line add_subdirectory (examples). +############ and unit tests by commenting out their lines: +# add_subdirectory (examples) +# set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve +# GeoidEval Gravity MagneticField Planimeter TransverseMercatorProj) +# add_subdirectory (tools) + add_subdirectory(GeographicLib) diff --git a/gtsam/3rdparty/GeographicLib/CMakeLists.txt b/gtsam/3rdparty/GeographicLib/CMakeLists.txt index 6122d2910..422791e17 100644 --- a/gtsam/3rdparty/GeographicLib/CMakeLists.txt +++ b/gtsam/3rdparty/GeographicLib/CMakeLists.txt @@ -321,8 +321,8 @@ if (APPLE) endif () # The list of tools (to be installed into, e.g., /usr/local/bin) -set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve - GeoidEval Gravity MagneticField Planimeter TransverseMercatorProj) +#set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve +# GeoidEval Gravity MagneticField Planimeter TransverseMercatorProj) # The list of scripts (to be installed into, e.g., /usr/local/sbin) set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity geographiclib-get-magnetic) @@ -336,7 +336,7 @@ include_directories ("${PROJECT_BINARY_DIR}/include" include) # The list of subdirectories to process add_subdirectory (src) add_subdirectory (include/GeographicLib) -add_subdirectory (tools) +# add_subdirectory (tools) add_subdirectory (man) add_subdirectory (doc) add_subdirectory (matlab)