From 75b45246b39554871f9c7a8811d6cb7a80fedaab Mon Sep 17 00:00:00 2001
From: Oleg Alexandrov <oleg.alexandrov@gmail.com>
Date: Mon, 15 Aug 2022 13:13:28 -0700
Subject: [PATCH] Fix compile-time conflict due to ambiguous Plugin.h

Fix compile error due to Plugin.h ambiguity
---
 CMakeLists.txt                    |  1 +
 include/usgscsm/UsgsAstroPlugin.h |  8 ++++----
 src/UsgsAstroFrameSensorModel.cpp |  4 ++--
 src/UsgsAstroPlugin.cpp           | 11 ++++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ad434..079c16d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,7 @@ set_target_properties(usgscsm PROPERTIES
 
 set(USGSCSM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/usgscsm"
                          "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                         "${CMAKE_CURRENT_SOURCE_DIR}"
                          "${EIGEN3_INCLUDE_DIR}")
 
 # These will be copied upon installation to ${CMAKE_INSTALL_INCLUDEDIR}/include
diff --git a/include/usgscsm/UsgsAstroPlugin.h b/include/usgscsm/UsgsAstroPlugin.h
index f1e950f..0392fec 100644
--- a/include/usgscsm/UsgsAstroPlugin.h
+++ b/include/usgscsm/UsgsAstroPlugin.h
@@ -26,11 +26,11 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define INCLUDE_USGSCSM_USGSASTROPLUGIN_H_
 
 #include <string>
-#include<map>
-#include<memory>
+#include <map>
+#include <memory>
 
-#include <Plugin.h>
-#include <Version.h>
+#include <csm/Plugin.h>
+#include <csm/Version.h>
 
 #include <nlohmann/json.hpp>
 #include "spdlog/spdlog.h"
diff --git a/src/UsgsAstroFrameSensorModel.cpp b/src/UsgsAstroFrameSensorModel.cpp
index 2b928ab..f2548ae 100644
--- a/src/UsgsAstroFrameSensorModel.cpp
+++ b/src/UsgsAstroFrameSensorModel.cpp
@@ -6,8 +6,8 @@
 
 #include <nlohmann/json.hpp>
 
-#include <Error.h>
-#include <Version.h>
+#include <csm/Error.h>
+#include <csm/Version.h>
 
 #include "ale/Util.h"
 
diff --git a/src/UsgsAstroPlugin.cpp b/src/UsgsAstroPlugin.cpp
index d90ea7c..8c5395e 100644
--- a/src/UsgsAstroPlugin.cpp
+++ b/src/UsgsAstroPlugin.cpp
@@ -34,11 +34,12 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <fstream>
 #include <string>
 
-#include <Error.h>
-#include <Plugin.h>
-#include <Version.h>
-#include <Warning.h>
-#include <csm.h>
+#include <csm/Error.h>
+#include <csm/Plugin.h>
+#include <csm/Version.h>
+#include <csm/Warning.h>
+#include <csm/csm.h>
+
 #include <math.h>
 
 #include "spdlog/sinks/basic_file_sink.h"
-- 
GitLab