Commit fede843b authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Got header install working.

parent b829900e

CMakeLists.txt

+6 −6
Original line number Diff line number Diff line
@@ -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()

src/UsgsAstroFramePlugin.cpp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <Warning.h>

#include <Version.h>



#include <json/json.hpp>

#include <json.hpp>





using json = nlohmann::json;

src/UsgsAstroFrameSensorModel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <iostream>

#include <sstream>



#include <json/json.hpp>

#include <json.hpp>



#include <Error.h>

#include <Version.h>

src/UsgsAstroLsPlugin.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <fstream>

#include <stdlib.h>

#include <math.h>

#include <json/json.hpp>

#include <json.hpp>





using json = nlohmann::json;

src/UsgsAstroLsStateData.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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