From 9a38b57144eda9a5ce07dbdc310ef857ead77fe8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Sat, 18 Feb 2023 19:34:23 -0500
Subject: [PATCH] update wrapper files to new version

---
 matlab/CMakeLists.txt                    | 2 +-
 python/CMakeLists.txt                    | 4 ++--
 python/gtsam/gtsam.tpl                   | 8 --------
 python/gtsam_unstable/gtsam_unstable.tpl | 5 -----
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index 4c54992bf..45d56e41d 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -83,7 +83,7 @@ set(interface_files
 )
 # Wrap
 matlab_wrap("${interface_files}" "gtsam" "${GTSAM_ADDITIONAL_LIBRARIES}"
-            "" "${mexFlags}" "${ignore}")
+            "" "${mexFlags}" "${ignore}" "${GTSAM_ENABLE_BOOST_SERIALIZATION}")
 
 # Wrap version for gtsam_unstable
 if(GTSAM_UNSTABLE_INSTALL_MATLAB_TOOLBOX)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 28bad4ad2..675fef4c3 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -87,7 +87,7 @@ pybind_wrap(${GTSAM_PYTHON_TARGET} # target
             ${PROJECT_SOURCE_DIR}/python/gtsam/gtsam.tpl
             gtsam # libs
             "gtsam;gtsam_header" # dependencies
-            OFF # use_boost
+            ${GTSAM_ENABLE_BOOST_SERIALIZATION} # use_boost_serialization
             )
 
 set_target_properties(${GTSAM_PYTHON_TARGET} PROPERTIES
@@ -167,7 +167,7 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
             ${PROJECT_SOURCE_DIR}/python/gtsam_unstable/gtsam_unstable.tpl
             gtsam_unstable # libs
             "gtsam_unstable;gtsam_unstable_header" # dependencies
-            OFF # use_boost
+            ${GTSAM_ENABLE_BOOST_SERIALIZATION} # use_boost_serialization
             )
 
     set_target_properties(${GTSAM_PYTHON_UNSTABLE_TARGET} PROPERTIES
diff --git a/python/gtsam/gtsam.tpl b/python/gtsam/gtsam.tpl
index a56f68176..d748fd65e 100644
--- a/python/gtsam/gtsam.tpl
+++ b/python/gtsam/gtsam.tpl
@@ -9,9 +9,6 @@
 
 #define PYBIND11_DETAILED_ERROR_MESSAGES
 
-// Include relevant boost libraries required by GTSAM
-{include_boost}
-
 #include <pybind11/eigen.h>
 #include <pybind11/stl_bind.h>
 #include <pybind11/pybind11.h>
@@ -29,11 +26,7 @@
 // Export classes for serialization
 {boost_class_export}
 
-// Holder type for pybind11
-{holder_type}
-
 // Preamble for STL classes
-// TODO(fan): make this automatic
 #include "python/gtsam/preamble/{module_name}.h"
 
 using namespace std;
@@ -50,7 +43,6 @@ namespace py = pybind11;
 {wrapped_namespace}
 
 // Specializations for STL classes
-// TODO(fan): make this automatic
 #include "python/gtsam/specializations/{module_name}.h"
 
 }}
diff --git a/python/gtsam_unstable/gtsam_unstable.tpl b/python/gtsam_unstable/gtsam_unstable.tpl
index 055fcaea7..b98872c46 100644
--- a/python/gtsam_unstable/gtsam_unstable.tpl
+++ b/python/gtsam_unstable/gtsam_unstable.tpl
@@ -7,9 +7,6 @@
  * ** THIS FILE IS AUTO-GENERATED, DO NOT MODIFY! **
  */
 
-// Include relevant boost libraries required by GTSAM
-{include_boost}
-
 #include <pybind11/eigen.h>
 #include <pybind11/stl_bind.h>
 #include <pybind11/pybind11.h>
@@ -24,8 +21,6 @@
 
 {boost_class_export}
 
-{holder_type}
-
 #include "python/gtsam_unstable/preamble.h"
 
 using namespace std;