From 0fc812f4df4c7f9ed05fbb1b429553defa0385ae Mon Sep 17 00:00:00 2001
From: Jose Luis Blanco-Claraco <jlblanco@ual.es>
Date: Sat, 15 Jun 2019 10:13:03 +0200
Subject: [PATCH 1/3] Missing DLL export macros

---
 gtsam/navigation/CombinedImuFactor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtsam/navigation/CombinedImuFactor.h b/gtsam/navigation/CombinedImuFactor.h
index a7802120c..2ad71cb3c 100644
--- a/gtsam/navigation/CombinedImuFactor.h
+++ b/gtsam/navigation/CombinedImuFactor.h
@@ -64,7 +64,7 @@ typedef ManifoldPreintegration PreintegrationType;
  *
  * @addtogroup SLAM
  */
-class PreintegratedCombinedMeasurements : public PreintegrationType {
+class GTSAM_EXPORT PreintegratedCombinedMeasurements : public PreintegrationType {
 
 public:
 
@@ -222,7 +222,7 @@ public:
  *
  * @addtogroup SLAM
  */
-class CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3,
+class GTSAM_EXPORT CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3,
     Vector3, imuBias::ConstantBias, imuBias::ConstantBias> {
 public:
 

From bf20ec91defcfc393885dd666fd207c519e4c192 Mon Sep 17 00:00:00 2001
From: Jose Luis Blanco-Claraco <jlblanco@ual.es>
Date: Sat, 15 Jun 2019 10:15:34 +0200
Subject: [PATCH 2/3] cmake: fix unset variable for MSVC

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bb70036..92da64c11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,7 +527,7 @@ if(GTSAM_UNSTABLE_AVAILABLE)
     print_config_flag(${GTSAM_BUILD_UNSTABLE}          "Build libgtsam_unstable        ")
 endif()
 string(TOUPPER "${CMAKE_BUILD_TYPE}" cmake_build_type_toupper)
-print_config_flag(${GTSAM_BUILD_WITH_MARCH_NATIVE}     "Build for native architecture  ")
+print_config_flag("${GTSAM_BUILD_WITH_MARCH_NATIVE}"     "Build for native architecture  ")
 if(NOT MSVC AND NOT XCODE_VERSION)
     message(STATUS "  Build type                     : ${CMAKE_BUILD_TYPE}")
     message(STATUS "  C compilation flags            : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${cmake_build_type_toupper}}")

From 89f8f501949c6f3fca50210208758f606ccf0eb3 Mon Sep 17 00:00:00 2001
From: Jose Luis Blanco-Claraco <jlblanco@ual.es>
Date: Sat, 15 Jun 2019 14:39:58 +0200
Subject: [PATCH 3/3] T made non-const for MSVC2017 to build

---
 gtsam/nonlinear/Values-inl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtsam/nonlinear/Values-inl.h b/gtsam/nonlinear/Values-inl.h
index 7e14578c3..ff220044a 100644
--- a/gtsam/nonlinear/Values-inl.h
+++ b/gtsam/nonlinear/Values-inl.h
@@ -145,13 +145,13 @@ namespace gtsam {
                 boost::make_filter_iterator(filter,
                     ((const Values&) values).begin(),
                     ((const Values&) values).end()),
-                &ValuesCastHelper<const ValueType, ConstKeyValuePair,
+                &ValuesCastHelper<ValueType, ConstKeyValuePair,
                     Values::ConstKeyValuePair>::cast)), constEnd_(
             boost::make_transform_iterator(
                 boost::make_filter_iterator(filter,
                     ((const Values&) values).end(),
                     ((const Values&) values).end()),
-                &ValuesCastHelper<const ValueType, ConstKeyValuePair,
+                &ValuesCastHelper<ValueType, ConstKeyValuePair,
                     Values::ConstKeyValuePair>::cast)) {
     }