Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eleaver rpcmodel hdf5 #255

Merged
merged 3 commits into from
May 22, 2020
Merged

Eleaver rpcmodel hdf5 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e94462f
1. Changed ossimRpcModel's destructor to public, rather than protected.
eleaver May 21, 2020
f82f338
Merge branch 'dev' into eleaver-rpcmodel-hdf5
eleaver May 21, 2020
84580dc
include_directories( ${MPI_CXX_INCLUDE_PATH} ${MPI_C_INCLUDE_PATH} ) …
eleaver May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
PROJECT(ossim)
############################################################
# From https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
#
# Use, don't skip, the full RPATH for the build tree
set(CMAKE_SKIP_BUILD_RPATH FALSE)

# When building, don't use the install RPATH already
# (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# the RPATH to be used when installing, but only if it's not a system directory
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
if("${isSystemDir}" STREQUAL "-1")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif("${isSystemDir}" STREQUAL "-1")
#################################################################



SET(CMAKE_MODULE_PATH "${${PROJECT_NAME}_SOURCE_DIR}/cmake/CMakeModules;${CMAKE_MODULE_PATH}")

set(CMAKE_CXX_STANDARD 11)
Expand All @@ -23,6 +48,7 @@ INCLUDE(OssimCommonVariables)
# Expose some build options
set(LIB_NAME ossim CACHE STRING "Name of ossim libray (default is ossim).")
OPTION(BUILD_OSSIM_FREETYPE_SUPPORT "Set to ON to build OSSIM with freetype support. Use OFF to turn off freetype support." ON)
OPTION(BUILD_OSSIM_HDF5_SUPPORT "Set to ON to build OSSIM with HDF5 support. Use OFF to turn off HDF5 support." OFF)
OPTION(BUILD_OSSIM_MPI_SUPPORT "Set to ON to build OSSIM with MPI support. Use OFF to turn off MPI support." OFF)
OPTION(BUILD_OSSIM_ID_SUPPORT "Set to ON to build OSSIM GIT ID support into the library. Use OFF to turn off ID support." ON)

Expand Down Expand Up @@ -155,7 +181,11 @@ set( OSSIM_HAS_MPI 0 )
if( BUILD_OSSIM_MPI_SUPPORT )
find_package(MPI)
if ( MPI_FOUND )
# /usr/share/cmake/Modules/FindMPI.cmae are not consistent in terminology,
# so we include multiple list names, knowing some will be empty
include_directories( ${MPI_INCLUDE_DIR} )
include_directories( ${MPI_CXX_INCLUDE_PATH} ${MPI_CXX_INCLUDE_DIRS} )
include_directories( ${MPI_C_INCLUDE_PATH} ${MPI_C_INCLUDE_DIRS} )
set( ossimDependentLibs ${ossimDependentLibs} ${MPI_LIBRARIES} )
set( OSSIM_HAS_MPI 1 )
else ( MPI_FOUND )
Expand Down
6 changes: 3 additions & 3 deletions include/ossim/projection/ossimRpcModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ class OSSIMDLLEXPORT ossimRpcModel : public ossimSensorModel
/** @brief copy construtor */
ossimRpcModel(const ossimRpcModel& copy_this);

/** @brief virtual destructor */
virtual ~ossimRpcModel();

void setAttributes(ossim_float64 theSampleOffset,
ossim_float64 theLineOffset,
ossim_float64 theSampleScale,
Expand Down Expand Up @@ -240,9 +243,6 @@ class OSSIMDLLEXPORT ossimRpcModel : public ossimSensorModel
NUM_ADJUSTABLE_PARAMS // not an index
};

/** @brief virtual destructor */
virtual ~ossimRpcModel();

//***
// Methods for computing RPC polynomial and its derivatives:
//***
Expand Down