update wrapper files to new version

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)

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

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"
 
 }}

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;