Update macos CI, fix geographiclib version checking

Author: nebudev14

.github/workflows/build-macos.yml

@@ -88,7 +88,7 @@ jobs:
         if: contains(matrix.name, 'geographiclib') && matrix.build_type == 'Release'
         run: |
           brew upgrade geographiclib --quiet || brew install geographiclib --quiet
-          echo "GTSAM_USE_GEOGRAPHICLIB=ON" >> $GITHUB_ENV
+          echo "GTSAM_ENABLE_GEOGRAPHICLIB=ON" >> $GITHUB_ENV
 
       - name: Build and Test
         run: bash .github/scripts/unix.sh -t

gtsam/navigation/tests/CMakeLists.txt

@@ -14,4 +14,4 @@ if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
   list(APPEND tests_excluded testSerializationNavigation.cpp)
 endif()
 
-gtsamaddtestsglob(navigation "test*.cpp" "${tests_excluded}" "${test_link_libraries}")
+gtsamAddTestsGlob(navigation "test*.cpp" "${tests_excluded}" "${test_link_libraries}")

gtsam/navigation/tests/testGPSFactor.cpp

@@ -29,8 +29,8 @@
  using namespace gtsam;
  using namespace GeographicLib;
 
- #if GEOGRAPHICLIB_VERSION_MINOR<37
- static const auto& kWGS84 = Geocentric::WGS84();
+ #if GEOGRAPHICLIB_VERSION_MAJOR < 2 && GEOGRAPHICLIB_VERSION_MINOR<37
+ static const auto& kWGS84 = Geocentric::WGS84;
  #else
  static const auto& kWGS84 = Geocentric::WGS84();
  #endif

gtsam/navigation/tests/testGeographicLib.cpp

@@ -33,8 +33,8 @@
  // Dekalb-Peachtree Airport runway 2L
  static const double lat = 33.87071, lon = -84.30482, h = 274;
 
- #if GEOGRAPHICLIB_VERSION_MINOR<37
- static const auto& kWGS84 = Geocentric::WGS84();
+ #if GEOGRAPHICLIB_VERSION_MAJOR < 2 && GEOGRAPHICLIB_VERSION_MINOR<37
+ static const auto& kWGS84 = Geocentric::WGS84;
  #else
  static const auto& kWGS84 = Geocentric::WGS84();
  #endif