Unverified Commit 2e6c1570 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Added basic ctest/gtest framework (#56) 

* Added basic ctest and gtest support

* Removed un-needed PUBLIC_HEADER flags

* Added some actual FramePlugin tests.
parent aa3af142

CMakeLists.txt

+17 −4
Original line number Diff line number Diff line
@@ -14,14 +14,21 @@ 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

)



find_library(CSM_LIBRARY csmapi REQUIRED)

find_path(CSM_INCLUDE_DIR NAMES csm)



target_include_directories(usgscsm PRIVATE

                           include/

target_include_directories(usgscsm

                           PUBLIC

                           include/usgscsm

                           include/

                           ${CSM_INCLUDE_DIR}

)
@@ -30,3 +37,9 @@ target_link_libraries(usgscsm ${CSM_LIBRARY}) 
install(TARGETS usgscsm

    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})



include(CTest)



enable_testing()



add_subdirectory(tests)

include/usgscsm/UsgsAstroFramePlugin.h

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 


#include <string>



#include <csm/Plugin.h>

#include <csm/Version.h>

#include <Plugin.h>

#include <Version.h>





class USGSASTROFRAME_EXPORT_API UsgsAstroFramePlugin : public csm::Plugin {

include/usgscsm/UsgsAstroFrameSensorModel.h

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#include <iostream>

#include <vector>



#include "csm/RasterGM.h"

#include "csm/CorrelationModel.h"

#include "RasterGM.h"

#include "CorrelationModel.h"



class UsgsAstroFrameSensorModel : public csm::RasterGM {

  // UsgsAstroFramePlugin needs to access private members

include/usgscsm/UsgsAstroLsISD.h

+18 −18
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 
#include <vector>

#include <string>



#include <csm/csm.h>

#include <csm/Isd.h>

#include <csm/SettableEllipsoid.h>

#include <csm.h>

#include <Isd.h>

#include <SettableEllipsoid.h>



class UsgsAstroLsISD

{

include/usgscsm/UsgsAstroLsPlugin.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define __USGS_ASTRO_LINE_SCANNER_PLUGIN_H



#include <string>

#include <csm/Plugin.h>

#include <Plugin.h>





class UsgsAstroLsPlugin : public csm::Plugin