From 337452417206e09a3b7ce626c6f407bc20ccbe53 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Sun, 12 Feb 2023 22:16:32 -0500
Subject: [PATCH 1/4] clean up cmake

---
 cmake/HandleGeneralOptions.cmake | 6 ------
 timing/CMakeLists.txt            | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/cmake/HandleGeneralOptions.cmake b/cmake/HandleGeneralOptions.cmake
index 83cf9bbb9..79e6fb174 100644
--- a/cmake/HandleGeneralOptions.cmake
+++ b/cmake/HandleGeneralOptions.cmake
@@ -29,12 +29,6 @@ option(GTSAM_ALLOW_DEPRECATED_SINCE_V43     "Allow use of methods/functions depr
 option(GTSAM_SUPPORT_NESTED_DISSECTION      "Support Metis-based nested dissection" ON)
 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)
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index 2ebfeb9d8..e3f97ee0c 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -1,6 +1,3 @@
-set (excluded_scripts
-    elaboratePoint2KalmanFilter.cpp
-)
 # Add scripts to exclude if GTSAM_ENABLE_BOOST_SERIALIZATION is not set
 if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION) 
   # add to excluded scripts

From 0e6cbfd44adf936e1fecd87941acf8944f7cb7c2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 13 Feb 2023 11:00:14 -0500
Subject: [PATCH 2/4] improved CMake for Boost serialization flag

---
 CMakeLists.txt                       | 2 +-
 cmake/HandlePrintConfiguration.cmake | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebe27443a..50c603bf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ include(cmake/HandleGeneralOptions.cmake)   # CMake build options
 # Enable or disable serialization with GTSAM_ENABLE_BOOST_SERIALIZATION
 option(GTSAM_ENABLE_BOOST_SERIALIZATION "Enable Boost serialization" ON)
 if(GTSAM_ENABLE_BOOST_SERIALIZATION)
-  add_definitions(-DGTSAM_ENABLE_BOOST_SERIALIZATION)
+  add_compile_definitions(GTSAM_ENABLE_BOOST_SERIALIZATION)
 endif()
 
 option(GTSAM_USE_BOOST_FEATURES "Enable Features that use Boost" ON)
diff --git a/cmake/HandlePrintConfiguration.cmake b/cmake/HandlePrintConfiguration.cmake
index dd3f6fc1f..1e3fa14ea 100644
--- a/cmake/HandlePrintConfiguration.cmake
+++ b/cmake/HandlePrintConfiguration.cmake
@@ -29,6 +29,8 @@ if(NOT MSVC AND NOT XCODE_VERSION)
     print_config("C++ compilation flags" "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}}")
 endif()
 
+print_config("Enable Boost serialization" "${GTSAM_ENABLE_BOOST_SERIALIZATION}")
+
 print_build_options_for_target(gtsam)
 
 print_config("Use System Eigen" "${GTSAM_USE_SYSTEM_EIGEN} (Using version: ${GTSAM_EIGEN_VERSION})")

From 4e999b3419bd2f8744e862c0f690629eff2037d5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 13 Feb 2023 11:02:19 -0500
Subject: [PATCH 3/4] enforce C++17 standards

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50c603bf7..5bdb59e28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,11 @@ set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})
 set (CMAKE_PROJECT_VERSION_MINOR ${GTSAM_VERSION_MINOR})
 set (CMAKE_PROJECT_VERSION_PATCH ${GTSAM_VERSION_PATCH})
 
+# Enforce c++17 standards
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 ###############################################################################
 # Gather information, perform checks, set defaults
 

From 464b025b466607e693f8081fe338a349b29da6a9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 13 Feb 2023 12:05:59 -0500
Subject: [PATCH 4/4] Revert "enforce C++17 standards"

This reverts commit 4e999b3419bd2f8744e862c0f690629eff2037d5.
---
 CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bdb59e28..50c603bf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,11 +29,6 @@ set (CMAKE_PROJECT_VERSION_MAJOR ${GTSAM_VERSION_MAJOR})
 set (CMAKE_PROJECT_VERSION_MINOR ${GTSAM_VERSION_MINOR})
 set (CMAKE_PROJECT_VERSION_PATCH ${GTSAM_VERSION_PATCH})
 
-# Enforce c++17 standards
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 ###############################################################################
 # Gather information, perform checks, set defaults