From fede843bca2ca40620acd16ece5703c62aad40fa Mon Sep 17 00:00:00 2001
From: Makayla Shepherd <mshepherd@usgs.gov>
Date: Thu, 16 Aug 2018 11:32:20 -0700
Subject: [PATCH] Got header install working.
---
CMakeLists.txt | 12 ++++++------
src/UsgsAstroFramePlugin.cpp | 2 +-
src/UsgsAstroFrameSensorModel.cpp | 2 +-
src/UsgsAstroLsPlugin.cpp | 2 +-
src/UsgsAstroLsStateData.cpp | 2 +-
tests/TestyMcTestFace.cpp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3163cc..4b8c4c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,12 +32,12 @@ set_target_properties(usgscsm PROPERTIES
SOVERSION 1
)
-
-set(USGSCAM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/usgscam")
+set(USGSCSM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/usgscsm"
+ "${CMAKE_CURRENT_SOURCE_DIR}/include/json")
target_include_directories(usgscsm
PUBLIC
- ${USGSCAM_INCLUDE_DIRS}
+ ${USGSCSM_INCLUDE_DIRS}
${CSM_INCLUDE_DIR}
)
@@ -52,11 +52,11 @@ target_link_libraries(usgscsm
if(WIN32)
install(TARGETS usgscsm
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(DIRECTORY ${USGSCAM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/usgscam)
+ install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/usgscsm)
else()
install(TARGETS usgscsm
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/usgscsm)
endif()
diff --git a/src/UsgsAstroFramePlugin.cpp b/src/UsgsAstroFramePlugin.cpp
index 4edd981..4641cd2 100644
--- a/src/UsgsAstroFramePlugin.cpp
+++ b/src/UsgsAstroFramePlugin.cpp
@@ -10,7 +10,7 @@
#include <Warning.h>
#include <Version.h>
-#include <json/json.hpp>
+#include <json.hpp>
using json = nlohmann::json;
diff --git a/src/UsgsAstroFrameSensorModel.cpp b/src/UsgsAstroFrameSensorModel.cpp
index 45421c8..bb93473 100644
--- a/src/UsgsAstroFrameSensorModel.cpp
+++ b/src/UsgsAstroFrameSensorModel.cpp
@@ -4,7 +4,7 @@
#include <iostream>
#include <sstream>
-#include <json/json.hpp>
+#include <json.hpp>
#include <Error.h>
#include <Version.h>
diff --git a/src/UsgsAstroLsPlugin.cpp b/src/UsgsAstroLsPlugin.cpp
index 7343b09..f275a0c 100644
--- a/src/UsgsAstroLsPlugin.cpp
+++ b/src/UsgsAstroLsPlugin.cpp
@@ -39,7 +39,7 @@
#include <fstream>
#include <stdlib.h>
#include <math.h>
-#include <json/json.hpp>
+#include <json.hpp>
using json = nlohmann::json;
diff --git a/src/UsgsAstroLsStateData.cpp b/src/UsgsAstroLsStateData.cpp
index 2e33bed..9b1fba8 100644
--- a/src/UsgsAstroLsStateData.cpp
+++ b/src/UsgsAstroLsStateData.cpp
@@ -33,7 +33,7 @@
#include <UsgsAstroLsPlugin.h>
#include <sstream>
#include <Error.h>
-#include <json/json.hpp>
+#include <json.hpp>
using json = nlohmann::json;
const std::string UsgsAstroLsStateData::SENSOR_MODEL_NAME
diff --git a/tests/TestyMcTestFace.cpp b/tests/TestyMcTestFace.cpp
index 2955822..20c569e 100644
--- a/tests/TestyMcTestFace.cpp
+++ b/tests/TestyMcTestFace.cpp
@@ -1,7 +1,7 @@
#include "UsgsAstroFramePlugin.h"
#include "UsgsAstroFrameSensorModel.h"
-#include <json/json.hpp>
+#include <json.hpp>
#include <sstream>
#include <fstream>
--
GitLab