Merge branch 'dev' of github.com:ossimlabs/ossim into dev

CMakeLists.txt

@@ -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)
@@ -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)
 
@@ -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 )

include/ossim/projection/ossimRpcModel.h

@@ -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,
@@ -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:
    //***

scripts/env.sh

@@ -193,6 +193,14 @@ if [ -d $OSSIM_DEV_HOME/ossim-plugins ] ; then
    fi
 fi
 
+if [ -d $OSSIM_DEV_HOME/ossim-deepcore ] ; then
+   if [ -z $BUILD_OSSIM_DEEPCORE ] ; then
+      export BUILD_OSSIM_DEEPCORE=ON
+   fi
+else
+   export BUILD_OSSIM_DEEPCORE=OFF
+fi
+
 # if [ -z $OSSIM_BUILD_ADDITIONAL_DIRECTORIES ] ; then
 #    if [ -d $OSSIM_DEV_HOME/ossim-private/ossim-kakadu-jpip-server ]; then
    #   export OSSIM_BUILD_ADDITIONAL_DIRECTORIES=$OSSIM_DEV_HOME/ossim-private/ossim-kakadu-jpip-server

scripts/ossim-env.sh

@@ -154,7 +154,6 @@ else
    export BUILD_OSSIM_WMS=OFF
 fi
 
-
 if [ -d $OSSIM_DEV_HOME/ossim-plugins ] ; then
 
    if [ -z $BUILD_CNES_PLUGIN ] ; then
@@ -236,6 +235,14 @@ if [ -d $OSSIM_DEV_HOME/ossim-plugins ] ; then
    fi
 fi
 
+if [ -d $OSSIM_DEV_HOME/ossim-deepcore ] ; then
+   if [ -z $BUILD_OSSIM_DEEPCORE ] ; then
+      export BUILD_OSSIM_DEEPCORE=ON
+   fi
+else
+   export BUILD_OSSIM_DEEPCORE=OFF
+fi
+
 # if [ -z $OSSIM_BUILD_ADDITIONAL_DIRECTORIES ] ; then
 #   if [ -d $OSSIM_DEV_HOME/ossim-private/ossim-kakadu-jpip-server ]; then
 #     export OSSIM_BUILD_ADDITIONAL_DIRECTORIES=$OSSIM_DEV_HOME/ossim-private/ossim-kakadu-jpip-server