From 903e7de15f2e24f1807c63b02c408ca97c3aee9f Mon Sep 17 00:00:00 2001
From: Jai Moraes <jmoraes@blackberry.com>
Date: Thu, 16 Jan 2025 10:13:27 -0500
Subject: [PATCH] Fixed remaining DESTINATION include/*

---
 .../3rdparty/GeographicLib/include/GeographicLib/CMakeLists.txt | 2 +-
 gtsam/3rdparty/cephes/CMakeLists.txt                            | 2 +-
 gtsam/hybrid/CMakeLists.txt                                     | 2 +-
 tests/testSerializationSlam.cpp                                 | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gtsam/3rdparty/GeographicLib/include/GeographicLib/CMakeLists.txt b/gtsam/3rdparty/GeographicLib/include/GeographicLib/CMakeLists.txt
index d4029a1e5..a249e02b5 100644
--- a/gtsam/3rdparty/GeographicLib/include/GeographicLib/CMakeLists.txt
+++ b/gtsam/3rdparty/GeographicLib/include/GeographicLib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Install the header files including the generated Config.h (which is in
 # the build tree).
 file (GLOB HEADERS [A-Za-z]*.hpp)
-install (FILES ${HEADERS} DESTINATION include/GeographicLib)
+install (FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeographicLib)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Config.h
   DESTINATION include/GeographicLib)
diff --git a/gtsam/3rdparty/cephes/CMakeLists.txt b/gtsam/3rdparty/cephes/CMakeLists.txt
index d1c8cfe0d..42fde8685 100644
--- a/gtsam/3rdparty/cephes/CMakeLists.txt
+++ b/gtsam/3rdparty/cephes/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CEPHES_HEADER_FILES
     dllexport.h)
 
 # Add header files
-install(FILES ${CEPHES_HEADER_FILES} DESTINATION include/gtsam/3rdparty/cephes)
+install(FILES ${CEPHES_HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/3rdparty/cephes)
 
 set(CEPHES_SOURCES
     cephes/airy.c
diff --git a/gtsam/hybrid/CMakeLists.txt b/gtsam/hybrid/CMakeLists.txt
index cdada00dd..19453dd01 100644
--- a/gtsam/hybrid/CMakeLists.txt
+++ b/gtsam/hybrid/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Install headers
 set(subdir hybrid)
 file(GLOB hybrid_headers "*.h")
-install(FILES ${hybrid_headers} DESTINATION include/gtsam/hybrid)
+install(FILES ${hybrid_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtsam/hybrid)
 
 # Add all tests
 add_subdirectory(tests)
diff --git a/tests/testSerializationSlam.cpp b/tests/testSerializationSlam.cpp
index a29485720..ed4c9e246 100644
--- a/tests/testSerializationSlam.cpp
+++ b/tests/testSerializationSlam.cpp
@@ -634,6 +634,7 @@ TEST(SubgraphSolver, Solves) {
     KeyInfo keyInfo(Ab);
     std::map<Key, Vector> lambda;
     system.build(Ab, keyInfo, lambda);
+    
     // Create a perturbed (non-zero) RHS
     const auto xbar = system.Rc1().optimize();  // merely for use in zero below
     auto values_y = VectorValues::Zero(xbar);