fix CI issue

cmake/HandleGeneralOptions.cmake

@@ -30,6 +30,12 @@ option(GTSAM_SUPPORT_NESTED_DISSECTION      "Support Metis-based nested dissecti
 option(GTSAM_TANGENT_PREINTEGRATION         "Use new ImuFactor with integration on tangent space" ON)
 option(GTSAM_SLOW_BUT_CORRECT_BETWEENFACTOR "Use the slower but correct version of BetweenFactor" OFF)
 option(GTSAM_ENABLE_BOOST_SERIALIZATION "Enable Boost serialization" ON)
+
+#TODO(kartikarcot) defining it in config.h.in did not work
+if (GTSAM_ENABLE_BOOST_SERIALIZATION)
+    add_definitions(-DGTSAM_ENABLE_BOOST_SERIALIZATION)
+endif()
+
 if(NOT MSVC AND NOT XCODE_VERSION)
     option(GTSAM_BUILD_WITH_CCACHE           "Use ccache compiler cache" ON)
 endif()

examples/CMakeLists.txt

@@ -2,4 +2,12 @@ set (excluded_examples
     elaboratePoint2KalmanFilter.cpp
 )
 
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is not set then SolverComparer.cpp will not compile
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  set (excluded_examples
+    ${excluded_examples}
+    SolverComparer.cpp
+  )
+endif()
+
 gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam;gtsam_unstable;${Boost_PROGRAM_OPTIONS_LIBRARY}")

gtsam/base/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(base "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/config.h.in

@@ -83,6 +83,3 @@
 
 // Toggle switch for BetweenFactor jacobian computation
 #cmakedefine GTSAM_SLOW_BUT_CORRECT_BETWEENFACTOR
-
-// Toggle Boost serialization definitions
-#cmakedefine GTSAM_ENABLE_BOOST_SERIALIZATION

gtsam/geometry/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(geometry "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/hybrid/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(hybrid "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/nonlinear/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(nonlinear "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/sam/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(sam "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/slam/tests/CMakeLists.txt

@@ -7,4 +7,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(slam "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/symbolic/tests/CMakeLists.txt

@@ -6,4 +6,4 @@ else()
   set(EXCLUDE_TESTS "")
 endif()
 
-gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+gtsamAddTestsGlob(symbolic "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")