Fix compile-time conflict due to ambiguous Plugin.h

Fix compile error due to Plugin.h ambiguity

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

include/usgscsm/UsgsAstroPlugin.h

@@ -29,8 +29,8 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #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"

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"
 

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"