Unverified Commit 2d407f34 authored by ihumphrey's avatar ihumphrey Committed by GitHub
Browse files

Merge pull request #80 from makaylas/master 

Make install copies the headers now
parents bb23e7d0 fede843b

CMakeLists.txt

+8 −12
Original line number Diff line number Diff line
@@ -30,18 +30,14 @@ add_library(usgscsm SHARED 
set_target_properties(usgscsm PROPERTIES

    VERSION ${PROJECT_VERSION}

    SOVERSION 1

    UsgsAstroFramePlugin.h

    UsgsAstroFrameSensorModel.h

    UsgsAstroLsISD.h

    UsgsAstroLsPlugin.h

    UsgsAstroLsSensorModel.h

    UsgsAstroLsStateData.h

)



set(USGSCSM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/usgscsm"

                         "${CMAKE_CURRENT_SOURCE_DIR}/include/json")



target_include_directories(usgscsm

                           PUBLIC

                           include/usgscsm

                           include/

                           ${USGSCSM_INCLUDE_DIRS}

                           ${CSM_INCLUDE_DIR}

)
@@ -55,12 +51,12 @@ target_link_libraries(usgscsm 


if(WIN32)

  install(TARGETS usgscsm

    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}

    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})

    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