cmake lists changes

gtsam/base/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(base "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationBase.cpp" "testStdOptionalSerialization.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/discrete/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(discrete "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationDiscrete.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/geometry/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(geometry "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationGeometry.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/hybrid/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(hybrid "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationHybrid.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/linear/tests/CMakeLists.txt

@@ -1,6 +1,15 @@
-gtsamAddTestsGlob(linear "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
-
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
-if(MSVC)
+  # create a semicolon seperated list of files to exclude
-	set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationLinear.cpp"
+	set(EXCLUDE_TESTS "testSerializationLinear.cpp")
-		APPEND PROPERTY COMPILE_FLAGS "/bigobj")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(linear "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+
+# Set properties to serialization target if Boost serialization is enabled and MSVC
+if (GTSAM_ENABLE_BOOST_SERIALIZATION AND MSVC)
+		set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationLinear.cpp"
+			APPEND PROPERTY COMPILE_FLAGS "/bigobj")
 endif()

gtsam/navigation/tests/CMakeLists.txt

@@ -24,4 +24,9 @@ else()
   endif()
 endif()
 
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  list(APPEND tests_excluded testSerializationNavigation.cpp)
+endif()
+
 gtsamAddTestsGlob(navigation "test*.cpp" "${tests_excluded}" "${test_link_libraries}")

gtsam/sam/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(sam "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationSam.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/slam/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(slam "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationDatataset.cpp" "testSerializationInSlam.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")

gtsam/symbolic/tests/CMakeLists.txt

@@ -1 +1,9 @@
-gtsamAddTestsGlob(symbolic "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationSymbolic.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")