[ossim] 06/14: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Thu Aug 24 17:18:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository ossim.
commit 0bc901df419e11185cbf449fedb17c2fec1ed855
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Aug 24 16:05:43 2017 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/accommodate-typo.patch | 38 -
debian/patches/avoid_overwrite_build_date.patch | 20 -
debian/patches/cmake | 1844 -----------------------
debian/patches/developed-typo.patch | 25 -
debian/patches/extension-typo.patch | 38 -
debian/patches/fix-ossim-trac-2354.diff | 51 -
debian/patches/message-typo.patch | 16 -
debian/patches/output-typo.patch | 135 --
debian/patches/requested-typo.patch | 16 -
debian/patches/series | 11 -
debian/patches/spelling-errors.patch | 97 --
debian/patches/unknown-typo.patch | 60 -
13 files changed, 1 insertion(+), 2351 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 66ed0b0..0584773 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ossim (2.0.0-1) UNRELEASED; urgency=medium
- Drop Files-Excluded, repacking no longer required
- Add license & copyright for jsoncpp & git-prompt.sh
- Update Files path for restructured upstream source tree
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Tue, 25 Jul 2017 12:20:49 +0200
diff --git a/debian/patches/accommodate-typo.patch b/debian/patches/accommodate-typo.patch
deleted file mode 100644
index c3a0ffb..0000000
--- a/debian/patches/accommodate-typo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix 'accomodate' typo, replace with 'accommodate'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/include/ossim/base/ossimGrect.h
-+++ b/ossim/include/ossim/base/ossimGrect.h
-@@ -136,7 +136,7 @@ public:
- inline ossimGrect combine(const ossimGrect& rect)const;
-
- /**
-- * Expands existing rect to accomodate argument point. If this object contains NaNs
-+ * Expands existing rect to accommodate argument point. If this object contains NaNs
- * (uninitialized), then the rect is set to 0-area with the arg point as both UL and LR --
- * convenient for establishing bounds in a loop over collection of points. This method does not
- * consider height.
---- a/ossim/src/ossim/projection/ossimPpjFrameSensor.cpp
-+++ b/ossim/src/ossim/projection/ossimPpjFrameSensor.cpp
-@@ -222,7 +222,7 @@ void ossimPpjFrameSensor::updateModel()
- m_cameraPositionEllipsoid.lond() + deltal,
- m_cameraPositionEllipsoid.height() + computeParameterOffset(PARAM_ADJ_ALTITUDE_OFFSET));
-
-- // TODO Need to add correction matrix to accomodate orientation offsets. It
-+ // TODO Need to add correction matrix to accommodate orientation offsets. It
- // shouldn't be done in ECF frame.
- // double r = ossim::degreesToRadians(m_roll + computeParameterOffset(PARAM_ADJ_ROLL_OFFSET));
- // double p = ossim::degreesToRadians(m_pitch + computeParameterOffset(PARAM_ADJ_PITCH_OFFSET) );
---- a/ossim/src/ossim/util/ossimSlopeUtil.cpp
-+++ b/ossim/src/ossim/util/ossimSlopeUtil.cpp
-@@ -89,7 +89,7 @@ void ossimSlopeUtil::addArguments(ossimA
- "--lut <filename>",
- "Specifies the optional lookup table filename for mapping the single-band output "
- "image to an RGB. The LUT provided must be in the ossimIndexToRgbLutFilter format "
-- "and should accomodate the output pixel range. This option forces remap to 8-bit, "
-+ "and should accommodate the output pixel range. This option forces remap to 8-bit, "
- "0-255 where 255 = 90 deg slope");
- au->addCommandLineOption(
- "--request-api",
diff --git a/debian/patches/avoid_overwrite_build_date.patch b/debian/patches/avoid_overwrite_build_date.patch
deleted file mode 100644
index db5d763..0000000
--- a/debian/patches/avoid_overwrite_build_date.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Avoid overwrite build date.
- Previous to use the current date to set the variable OSSIM_BUILD_DATE check if
- it was already defined in command line.
-Author: Juan Picca <jumapico at gmail.com>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/CMakeLists.txt
-+++ b/ossim/CMakeLists.txt
-@@ -158,7 +158,9 @@ endif ( ZLIB_FOUND )
- #---
- # Call the OSSIM macros in OssimUtilities.cmake
- #---
--TODAYS_DATE(OSSIM_BUILD_DATE)
-+if ( NOT OSSIM_BUILD_DATE )
-+ TODAYS_DATE(OSSIM_BUILD_DATE)
-+endif()
- SET(OSSIM_SVN_REVISION_NUMBER "UNKNOWN")
- GET_SVN_REVISION()
- if ( NOT ${Project_WC_REVISION} EQUAL 0 )
diff --git a/debian/patches/cmake b/debian/patches/cmake
deleted file mode 100644
index c08ea23..0000000
--- a/debian/patches/cmake
+++ /dev/null
@@ -1,1844 +0,0 @@
-Description: Added cmake support files.
- This patch needs to be updated for every new OSSIM release to include the
- CMakeModules from the ossim_package_support subdirectory in the upstream
- tarball.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Forwarded: not-needed
-
---- /dev/null
-+++ b/ossim/CMakeModules/FindCPPUNIT.cmake
-@@ -0,0 +1,43 @@
-+# - Find CPPUNIT
-+# Find the native CPPUNIT includes and library
-+# This module defines
-+# CPPUNIT_INCLUDE_DIR, where to find jpeglib.h, etc.
-+# CPPUNIT_LIBRARIES, the libraries needed to use CPPUNIT.
-+# CPPUNIT_FOUND, If false, do not try to use CPPUNIT.
-+# also defined, but not for general use are
-+# CPPUNIT_LIBRARY, where to find the CPPUNIT library.
-+
-+#=============================================================================
-+# Copyright 2001-2009 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distributed this file outside of CMake, substitute the full
-+# License text for the above reference.)
-+
-+FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/Test.h)
-+
-+SET(CPPUNIT_NAMES ${CPPUNIT_NAMES} cppunit libcppunit)
-+FIND_LIBRARY(CPPUNIT_LIBRARY NAMES ${CPPUNIT_NAMES} )
-+
-+# handle the QUIETLY and REQUIRED arguments and set CPPUNIT_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR)
-+
-+IF(CPPUNIT_FOUND)
-+ SET(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})
-+ENDIF(CPPUNIT_FOUND)
-+
-+# Deprecated declarations.
-+SET (NATIVE_CPPUNIT_INCLUDE_PATH ${CPPUNIT_INCLUDE_DIR} )
-+IF(CPPUNIT_LIBRARY)
-+ GET_FILENAME_COMPONENT (NATIVE_CPPUNIT_LIB_PATH ${CPPUNIT_LIBRARY} PATH)
-+ENDIF(CPPUNIT_LIBRARY)
-+
-+MARK_AS_ADVANCED(CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR )
---- /dev/null
-+++ b/ossim/CMakeModules/FindFreetype.cmake
-@@ -0,0 +1,95 @@
-+# - Locate FreeType library
-+# This module defines
-+# FREETYPE_LIBRARIES, the library to link against
-+# FREETYPE_FOUND, if false, do not try to link to FREETYPE
-+# FREETYPE_INCLUDE_DIRS, where to find headers.
-+# This is the concatenation of the paths:
-+# FREETYPE_INCLUDE_DIR_ft2build
-+# FREETYPE_INCLUDE_DIR_freetype2
-+#
-+# $FREETYPE_DIR is an environment variable that would
-+# correspond to the ./configure --prefix=$FREETYPE_DIR
-+# used in building FREETYPE.
-+
-+#=============================================================================
-+# Copyright 2007-2009 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distributed this file outside of CMake, substitute the full
-+# License text for the above reference.)
-+
-+# Created by Eric Wing.
-+# Modifications by Alexander Neundorf.
-+# This file has been renamed to "FindFreetype.cmake" instead of the correct
-+# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
-+
-+# Ugh, FreeType seems to use some #include trickery which
-+# makes this harder than it should be. It looks like they
-+# put ft2build.h in a common/easier-to-find location which
-+# then contains a #include to a more specific header in a
-+# more specific location (#include <freetype/config/ftheader.h>).
-+# Then from there, they need to set a bunch of #define's
-+# so you can do something like:
-+# #include FT_FREETYPE_H
-+# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
-+# wants explicit full paths and this trickery doesn't work too well.
-+# I'm going to attempt to cut out the middleman and hope
-+# everything still works.
-+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-+ HINTS
-+ $ENV{FREETYPE_DIR}
-+ PATH_SUFFIXES include
-+ PATHS
-+ /usr/local/X11R6/include
-+ /usr/local/X11/include
-+ /usr/X11/include
-+ /sw/include
-+ /opt/local/include
-+ /usr/freeware/include
-+)
-+
-+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+ HINTS
-+ $ENV{FREETYPE_DIR}/include/freetype2
-+ PATHS
-+ /usr/local/X11R6/include
-+ /usr/local/X11/include
-+ /usr/X11/include
-+ /sw/include
-+ /opt/local/include
-+ /usr/freeware/include
-+ PATH_SUFFIXES freetype2
-+)
-+
-+FIND_LIBRARY(FREETYPE_LIBRARY
-+ NAMES freetype libfreetype freetype219 freetype239
-+ HINTS
-+ $ENV{FREETYPE_DIR}
-+ PATH_SUFFIXES lib64 lib
-+ PATHS
-+ /usr/local/X11R6
-+ /usr/local/X11
-+ /usr/X11
-+ /sw
-+ /usr/freeware
-+)
-+
-+# set the user variables
-+IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-+ SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
-+ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-+SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-+
-+# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
-+
-+
-+MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
---- /dev/null
-+++ b/ossim/CMakeModules/FindGEOS.cmake
-@@ -0,0 +1,84 @@
-+#---
-+# File: FindGEOS.cmake
-+#
-+# Find the native GEOS(Geometry Engine - Open Source) includes and libraries.
-+#
-+# This module defines:
-+#
-+# GEOS_INCLUDE_DIR, where to find geos.h, etc.
-+# GEOS_LIBRARY, libraries to link against to use GEOS. Currently there are
-+# two looked for, geos and geos_c libraries.
-+# GEOS_FOUND, True if found, false if one of the above are not found.
-+#
-+# For ossim, typically geos will be system installed which should be found;
-+# or found in the ossim 3rd party dependencies directory from a geos build
-+# and install. If the latter it will rely on CMAKE_INCLUDE_PATH and
-+# CMAKE_LIBRARY_PATH having the path to the party dependencies directory.
-+#
-+# NOTE:
-+# This script is specialized for ossim, e.g. looking in /usr/local/ossim.
-+#
-+# $Id: FindGEOS.cmake 23086 2015-01-20 16:20:12Z rashadkm $
-+#---
-+
-+#---
-+# Find include path:
-+# Note: Ubuntu 14.04+ did not have geos.h (not included in any ossim src).
-+# Instead looking for Geometry.h
-+#---
-+
-+find_path( GEOS_INCLUDE_DIR geos/geom/Geometry.h
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ ${GEOS_DIR}/include
-+ /usr/include
-+ /usr/local/include
-+ /usr/local/ossim/include )
-+
-+# Find GEOS library:
-+find_library( GEOS_LIB NAMES geos
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ ${GEOS_DIR}/lib
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib
-+ /usr/local/ossim/lib )
-+
-+# Find GEOS C library:
-+find_library( GEOS_C_LIB NAMES geos_c
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ ${GEOS_DIR}/lib
-+ /usr/lib64
-+ /usr/lib
-+ /usr/local/lib
-+ /usr/local/ossim/lib )
-+
-+# Set the GEOS_LIBRARY:
-+if( GEOS_LIB AND GEOS_C_LIB )
-+ set( GEOS_LIBRARY ${GEOS_LIB} ${GEOS_C_LIB} CACHE STRING INTERNAL )
-+endif(GEOS_LIB AND GEOS_C_LIB )
-+
-+#---
-+# This function sets GEOS_FOUND if variables are valid.
-+#---
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( GEOS DEFAULT_MSG
-+ GEOS_LIBRARY
-+ GEOS_INCLUDE_DIR )
-+
-+if( GEOS_FOUND )
-+ if( NOT GEOS_FIND_QUIETLY )
-+ message( STATUS "Found GEOS..." )
-+ endif( NOT GEOS_FIND_QUIETLY )
-+else( GEOS_FOUND )
-+ if( NOT GEOS_FIND_QUIETLY )
-+ message( WARNING "Could not find GEOS" )
-+ endif( NOT GEOS_FIND_QUIETLY )
-+endif( GEOS_FOUND )
-+
-+if( NOT GEOS_FIND_QUIETLY )
-+ message( STATUS "GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR}" )
-+ message( STATUS "GEOS_LIBRARY=${GEOS_LIBRARY}" )
-+endif( NOT GEOS_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindGEOTIFF.cmake
-@@ -0,0 +1,36 @@
-+# - Find geotiff library
-+# Find the native geotiff includes and library
-+# This module defines
-+# GEOTIFF_INCLUDE_DIR, where to find tiff.h, etc.
-+# GEOTIFF_LIBRARIES, libraries to link against to use GEOTIFF.
-+# GEOTIFF_FOUND, If false, do not try to use GEOTIFF.
-+# also defined, but not for general use are
-+# GEOTIFF_LIBRARY, where to find the GEOTIFF library.
-+
-+FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ /usr/include/geotiff
-+ /usr/include/libgeotiff
-+ /usr/local/include/libgeotiff
-+ /usr/local/include/geotiff)
-+
-+SET(GEOTIFF_NAMES ${GEOTIFF_NAMES} geotiff_i geotiff libgeotiff_i libgeotiff)
-+FIND_LIBRARY(GEOTIFF_LIBRARY
-+ NAMES ${GEOTIFF_NAMES}
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ /usr/local/lib
-+ /usr/lib
-+ /usr/lib/x86_64-linux-gnu)
-+
-+# handle the QUIETLY and REQUIRED arguments and set GEOTIFF_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOTIFF DEFAULT_MSG GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR)
-+
-+IF(GEOTIFF_FOUND)
-+ SET( GEOTIFF_LIBRARIES ${GEOTIFF_LIBRARY} )
-+ENDIF(GEOTIFF_FOUND)
-+
-+MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIR GEOTIFF_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindJPEG.cmake
-@@ -0,0 +1,55 @@
-+# - Find JPEG
-+# Find the native JPEG includes and library
-+# This module defines
-+# JPEG_INCLUDE_DIR, where to find jpeglib.h, etc.
-+# JPEG_LIBRARIES, the libraries needed to use JPEG.
-+# JPEG_FOUND, If false, do not try to use JPEG.
-+# also defined, but not for general use are
-+# JPEG_LIBRARY, where to find the JPEG library.
-+
-+#=============================================================================
-+# Copyright 2001-2009 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distributed this file outside of CMake, substitute the full
-+# License text for the above reference.)
-+
-+FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ /usr/local/include
-+ /usr/include )
-+
-+SET(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg)
-+
-+# Added x86_64-linux-gnu path for Ubuntu install
-+FIND_LIBRARY(JPEG_LIBRARY
-+ NAMES ${JPEG_NAMES}
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ /usr/local/lib
-+ /usr/lib
-+ /usr/lib/x86_64-linux-gnu)
-+
-+# handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR)
-+
-+IF(JPEG_FOUND)
-+ SET(JPEG_LIBRARIES ${JPEG_LIBRARY})
-+ENDIF(JPEG_FOUND)
-+
-+# Deprecated declarations.
-+SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} )
-+IF(JPEG_LIBRARY)
-+ GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
-+ENDIF(JPEG_LIBRARY)
-+
-+MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR )
---- /dev/null
-+++ b/ossim/CMakeModules/FindMiniZip.cmake
-@@ -0,0 +1,26 @@
-+# - Find minizip
-+# Find the native MINIZIP includes and library
-+#
-+# MINIZIP_INCLUDE_DIRS - where to find minizip's zip.h, etc.
-+# MINIZIP_LIBRARIES - List of libraries when using minizip.
-+# MINIZIP_FOUND - True if minizip found.
-+
-+IF (MINIZIP_INCLUDE_DIR)
-+ # Already in cache, be silent
-+ SET(MINIZIP_FIND_QUIETLY TRUE)
-+ENDIF (MINIZIP_INCLUDE_DIR)
-+
-+FIND_PATH(MINIZIP_INCLUDE_DIR minizip/zip.h)
-+
-+SET(MINIZIP_NAMES minizip )
-+FIND_LIBRARY(MINIZIP_LIBRARY NAMES ${MINIZIP_NAMES} )
-+MARK_AS_ADVANCED( MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR )
-+
-+# Per-recommendation
-+SET(MINIZIP_INCLUDE_DIRS "${MINIZIP_INCLUDE_DIR}")
-+SET(MINIZIP_LIBRARIES "${MINIZIP_LIBRARY}")
-+
-+# handle the QUIETLY and REQUIRED arguments and set MINIZIP_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MINIZIP DEFAULT_MSG MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS)
---- /dev/null
-+++ b/ossim/CMakeModules/FindRegex.cmake
-@@ -0,0 +1,64 @@
-+# -*- cmake -*-
-+#
-+# FindRegex.cmake: Try to find Regex
-+#
-+# Copyright (C) 2005-2013 EDF-EADS-Phimeca
-+#
-+# This library is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# along with this library. If not, see <http://www.gnu.org/licenses/>.
-+#
-+# @author dutka
-+# @date 2010-02-04 16:44:49 +0100 (Thu, 04 Feb 2010)
-+#
-+#
-+# - Try to find Regex
-+# Once done this will define
-+#
-+# REGEX_FOUND - System has Regex
-+# REGEX_INCLUDE_DIR - The Regex include directory
-+# REGEX_LIBRARIES - The libraries needed to use Regex
-+# REGEX_DEFINITIONS - Compiler switches required for using Regex
-+
-+IF (REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
-+ # in cache already
-+ SET(Regex_FIND_QUIETLY TRUE)
-+ENDIF (REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
-+
-+#IF (NOT WIN32)
-+# # use pkg-config to get the directories and then use these values
-+# # in the FIND_PATH() and FIND_LIBRARY() calls
-+# FIND_PACKAGE(PkgConfig)
-+# PKG_CHECK_MODULES(PC_REGEX regex)
-+# SET(REGEX_DEFINITIONS ${PC_REGEX_CFLAGS_OTHER})
-+#ENDIF (NOT WIN32)
-+
-+FIND_PATH(REGEX_INCLUDE_DIR regex.h
-+ HINTS
-+ ${REGEX_INCLUDEDIR}
-+ ${PC_LIBXML_INCLUDE_DIRS}
-+ PATH_SUFFIXES regex
-+ )
-+
-+FIND_LIBRARY(REGEX_LIBRARIES NAMES c regex
-+ HINTS
-+ ${PC_REGEX_LIBDIR}
-+ ${PC_REGEX_LIBRARY_DIRS}
-+ )
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+
-+# handle the QUIETLY and REQUIRED arguments and set REGEX_FOUND to TRUE if
-+# all listed variables are TRUE
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Regex DEFAULT_MSG REGEX_LIBRARIES REGEX_INCLUDE_DIR)
-+
-+MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES)
---- /dev/null
-+++ b/ossim/CMakeModules/FindStlPort.cmake
-@@ -0,0 +1,26 @@
-+#---
-+# $Id: FindStlPort.cmake 21190 2012-06-29 19:54:24Z dburken $
-+#
-+# Find the stlport includes and library
-+#
-+# This module defines:
-+# STLPORT_INCLUDE_DIR, where to find iostream, string, etc.
-+# STLPORT_LIBRARIES, libraries to link against to use StlPort.
-+# STLPORT_FOUND, If false, do not try to use STLPORT.
-+#---
-+
-+FIND_PATH(STLPORT_INCLUDE_DIR iostream PATHS C:/STLport-5.2.1/stlport D:/STLport-5.2.1/stlport)
-+
-+SET(STLPORT_NAMES ${STLPORT_NAMES} stlport5.2.lib)
-+FIND_LIBRARY(STLPORT_LIBRARY NAMES ${STLPORT_NAMES} )
-+
-+# handle the QUIETLY and REQUIRED arguments and set STLPORT_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(STLPORT DEFAULT_MSG STLPORT_LIBRARY STLPORT_INCLUDE_DIR)
-+
-+IF(STLPORT_FOUND)
-+ SET( STLPORT_LIBRARIES ${STLPORT_LIBRARY} )
-+ENDIF(STLPORT_FOUND)
-+
-+MARK_AS_ADVANCED(STLPORT_INCLUDE_DIR STLPORT_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindSubversion.cmake
-@@ -0,0 +1,148 @@
-+# - Extract information from a subversion working copy
-+# The module defines the following variables:
-+# Subversion_SVN_EXECUTABLE - path to svn command line client
-+# Subversion_VERSION_SVN - version of svn command line client
-+# Subversion_FOUND - true if the command line client was found
-+# SUBVERSION_FOUND - same as Subversion_FOUND, set for compatiblity reasons
-+#
-+# The minimum required version of Subversion can be specified using the
-+# standard syntax, e.g. FIND_PACKAGE(Subversion 1.4)
-+#
-+# If the command line client executable is found two macros are defined:
-+# Subversion_WC_INFO(<dir> <var-prefix>)
-+# Subversion_WC_LOG(<dir> <var-prefix>)
-+# Subversion_WC_INFO extracts information of a subversion working copy at
-+# a given location. This macro defines the following variables:
-+# <var-prefix>_WC_URL - url of the repository (at <dir>)
-+# <var-prefix>_WC_ROOT - root url of the repository
-+# <var-prefix>_WC_REVISION - current revision
-+# <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
-+# <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
-+# <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
-+# <var-prefix>_WC_INFO - output of command `svn info <dir>'
-+# Subversion_WC_LOG retrieves the log message of the base revision of a
-+# subversion working copy at a given location. This macro defines the
-+# variable:
-+# <var-prefix>_LAST_CHANGED_LOG - last log of base revision
-+# Example usage:
-+# FIND_PACKAGE(Subversion)
-+# IF(SUBVERSION_FOUND)
-+# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-+# MESSAGE("Current revision is ${Project_WC_REVISION}")
-+# Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
-+# MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
-+# ENDIF(SUBVERSION_FOUND)
-+#
-+# History (yyyymmdd):
-+# 20121002 - Modified to "continue on" if svn is not found. (drb)
-+#
-+#=============================================================================
-+# Copyright 2006-2009 Kitware, Inc.
-+# Copyright 2006 Tristan Carel
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+# License text for the above reference.)
-+
-+FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
-+ DOC "subversion command line client")
-+MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
-+
-+IF(Subversion_SVN_EXECUTABLE)
-+ # the subversion commands should be executed with the C locale, otherwise
-+ # the message (which are parsed) may be translated, Alex
-+ SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
-+ SET(ENV{LC_ALL} C)
-+
-+ EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
-+ OUTPUT_VARIABLE Subversion_VERSION_SVN
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+
-+ # restore the previous LC_ALL
-+ SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
-+
-+ STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
-+ "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
-+
-+ MACRO(Subversion_WC_INFO dir prefix)
-+ # the subversion commands should be executed with the C locale, otherwise
-+ # the message (which are parsed) may be translated, Alex
-+ SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
-+ SET(ENV{LC_ALL} C)
-+
-+ EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} info ${dir}
-+ OUTPUT_VARIABLE ${prefix}_WC_INFO
-+ ERROR_VARIABLE Subversion_svn_info_error
-+ RESULT_VARIABLE Subversion_svn_info_result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+
-+ IF(NOT ${Subversion_svn_info_result} EQUAL 0)
-+ MESSAGE(WARNING "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
-+ ELSE(NOT ${Subversion_svn_info_result} EQUAL 0)
-+
-+ STRING(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
-+ STRING(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
-+ STRING(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
-+ STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
-+ STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
-+ STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
-+ "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
-+
-+ ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)
-+
-+ # restore the previous LC_ALL
-+ SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
-+
-+ ENDMACRO(Subversion_WC_INFO)
-+
-+ MACRO(Subversion_WC_LOG dir prefix)
-+ # This macro can block if the certificate is not signed:
-+ # svn ask you to accept the certificate and wait for your answer
-+ # This macro requires a svn server network access (Internet most of the time)
-+ # and can also be slow since it access the svn server
-+ EXECUTE_PROCESS(COMMAND
-+ ${Subversion_SVN_EXECUTABLE} --non-interactive log -r BASE ${dir}
-+ OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
-+ ERROR_VARIABLE Subversion_svn_log_error
-+ RESULT_VARIABLE Subversion_svn_log_result
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+
-+ IF(NOT ${Subversion_svn_log_result} EQUAL 0)
-+ MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
-+ ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
-+ ENDMACRO(Subversion_WC_LOG)
-+
-+ENDIF(Subversion_SVN_EXECUTABLE)
-+
-+#---
-+# This function sets GEOS_FOUND if variables are valid.
-+#---
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( SUBVERSION DEFAULT_MSG
-+ Subversion_SVN_EXECUTABLE
-+ Subversion_VERSION_SVN )
-+
-+if( SUBVERSION_FOUND )
-+ if( NOT SUBVERSION_FIND_QUIETLY )
-+ message( STATUS "Found SUBVERSION..." )
-+ endif( NOT SUBVERSION_FIND_QUIETLY )
-+else( SUBVERSION_FOUND )
-+ if( NOT SUBVERSION_FIND_QUIETLY )
-+ message( WARNING "Could not find SUBVERSION" )
-+ endif( NOT SUBVERSION_FIND_QUIETLY )
-+endif( SUBVERSION_FOUND )
-+
-+if( NOT SUBVERSION_FIND_QUIETLY )
-+ message( STATUS "Subversion_VERSION_SVN=${Subversion_VERSION_SVN}" )
-+endif( NOT SUBVERSION_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindTIFF.cmake
-@@ -0,0 +1,52 @@
-+# - Find TIFF library
-+# Find the native TIFF includes and library
-+# This module defines
-+# TIFF_INCLUDE_DIR, where to find tiff.h, etc.
-+# TIFF_LIBRARIES, libraries to link against to use TIFF.
-+# TIFF_FOUND, If false, do not try to use TIFF.
-+# also defined, but not for general use are
-+# TIFF_LIBRARY, where to find the TIFF library.
-+
-+#=============================================================================
-+# Copyright 2002-2009 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+# License text for the above reference.)
-+
-+FIND_PATH(TIFF_INCLUDE_DIR tiff.h
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/include
-+ /usr/local/include
-+ /usr/local/include/tiff
-+ /usr/include/
-+ /usr/include/tiff)
-+
-+
-+SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff_i libtiff tiff3 libtiff3)
-+
-+# Added x86_64-linux-gnu path for Ubuntu install
-+FIND_LIBRARY(TIFF_LIBRARY
-+ NAMES ${TIFF_NAMES}
-+ PATHS
-+ ${CMAKE_INSTALL_PREFIX}/lib
-+ /usr/local/lib
-+ /usr/lib
-+ /usr/lib/x86_64-linux-gnu)
-+
-+# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_LIBRARY TIFF_INCLUDE_DIR)
-+
-+IF(TIFF_FOUND)
-+ SET( TIFF_LIBRARIES ${TIFF_LIBRARY} )
-+ENDIF(TIFF_FOUND)
-+
-+MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/Findossim.cmake
-@@ -0,0 +1,68 @@
-+#---
-+# File: FindOSSIM.cmake
-+#
-+# Find OSSIM(Open Source Software Image Map) includes and libraries.
-+#
-+# This module defines:
-+#
-+# OSSIM_INCLUDE_DIR, Where to find ossimVersion.h, etc.
-+# OSSIM_LIBRARIES, Libraries to link against to use OSSIM.
-+# OSSIM_FOUND, True if found, false if one of the above are not found.
-+# also defined, but not for general use are
-+# OSSIM_LIBRARY, where to find the OSSIM library.
-+#---
-+
-+#---
-+# Find include path:
-+#---
-+set(CMAKE_FIND_FRAMEWORK "LAST")
-+find_path(OSSIM_INCLUDE_DIR ossim/ossimVersion.h ossimVersion.h
-+ PATHS
-+ $ENV{OSSIM_DEV_HOME}/ossim/include
-+ $ENV{OSSIM_DEV_HOME}/ossim/latest/include
-+ $ENV{OSSIM_INSTALL_PREFIX}/include
-+ $ENV{OSSIM_DEV_HOME}/ossim
-+ $ENV{OSSIM_INSTALL_PREFIX}
-+ PATH_SUFFIXES
-+ include
-+ lib
-+)
-+
-+set(OSSIM_NAMES ${OSSIM_NAMES} ossim libossim)
-+find_library(OSSIM_LIBRARY NAMES ${OSSIM_NAMES}
-+ PATHS
-+ $ENV{OSSIM_INSTALL_PREFIX}/lib${LIBSUFFIX}
-+ $ENV{OSSIM_BUILD_DIR}/build_ossim/lib${LIBSUFFIX}
-+ $ENV{OSSIM_BUILD_DIR}/lib${LIBSUFFIX}
-+ $ENV{OSSIM_DEV_HOME}/build/build_ossim/lib${LIBSUFFIX}
-+ $ENV{OSSIM_DEV_HOME}/build/lib${LIBSUFFIX}
-+ $ENV{OSSIM_DEV_HOME}/ossim/lib${LIBSUFFIX}
-+ $ENV{OSSIM_INSTALL_PREFIX}
-+ PATH_SUFFIXES
-+ lib
-+ Frameworks
-+)
-+
-+#---
-+# This function sets OSSIM_FOUND if variables are valid.
-+#---
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( OSSIM DEFAULT_MSG
-+ OSSIM_LIBRARY
-+ OSSIM_INCLUDE_DIR )
-+
-+if(OSSIM_FOUND)
-+ set( OSSIM_LIBRARIES ${OSSIM_LIBRARY} )
-+ set( OSSIM_INCLUDES ${OSSIM_INCLUDE_DIR} )
-+else( OSSIM_FOUND )
-+ if( NOT OSSIM_FIND_QUIETLY )
-+ message( WARNING "Could not find OSSIM" )
-+ endif( NOT OSSIM_FIND_QUIETLY )
-+endif(OSSIM_FOUND)
-+
-+if( NOT OSSIM_FIND_QUIETLY )
-+ message( STATUS "OSSIM_INCLUDE_DIR=${OSSIM_INCLUDE_DIR}" )
-+ message( STATUS "OSSIM_LIBRARY=${OSSIM_LIBRARY}" )
-+endif( NOT OSSIM_FIND_QUIETLY )
-+
-+MARK_AS_ADVANCED(OSSIM_INCLUDES OSSIM_INCLUDE_DIR OSSIM_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/OssimCPack.cmake
-@@ -0,0 +1,156 @@
-+# This script sets up packaging targets for each "COMPONENT" as specified in INSTALL commands
-+#
-+# for each component a CPackConfig-<component>.cmake is generated in the build tree
-+# and a target is added to call cpack for it (e.g. package_ossim
-+# A target for generating a package with everything that gets INSTALLED is generated (package_ossim-all)
-+# A target for making all of the above packages is generated (package_ALL)
-+#
-+# package filenames are created on the form <package>-<platform>-<arch>[-<compiler>]-<build_type>[-static].tgz
-+# ...where compiler optionally set using a cmake gui (OSSIM_CPACK_COMPILER). This script tries to guess compiler version for msvc generators
-+# ...build_type matches CMAKE_BUILD_TYPE for all generators but the msvc ones
-+
-+# resolve architecture. The reason i "change" i686 to i386 is that debian packages
-+# require i386 so this is for the future
-+IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
-+ SET(SYSTEM_ARCH "i386")
-+ELSE()
-+ SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-+ENDIF()
-+
-+# set a default system name - use CMake setting (Linux|Windows|...)
-+SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
-+#message(STATUS "CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
-+#message(STATUS "CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
-+
-+# for msvc the SYSTEM_NAME is set win32/64 instead of "Windows"
-+IF(MSVC)
-+ IF(CMAKE_CL_64)
-+ SET(SYSTEM_NAME "win64")
-+ ELSE()
-+ SET(SYSTEM_NAME "win32")
-+ ENDIF()
-+ENDIF()
-+# Guess the compiler (is this desired for other platforms than windows?)
-+IF(NOT DEFINED OSSIM_CPACK_COMPILER)
-+ INCLUDE(OssimDetermineCompiler)
-+ENDIF()
-+
-+# expose the compiler setting to the user
-+SET(OSSIM_CPACK_COMPILER "${OSSIM_COMPILER}" CACHE STRING "This ia short string (vc90, vc80sp1, gcc-4.3, ...) describing your compiler. The string is used for creating package filenames")
-+
-+IF(OSSIM_CPACK_COMPILER)
-+ SET(OSSIM_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${OSSIM_CPACK_COMPILER})
-+ELSE()
-+ SET(OSSIM_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH})
-+ENDIF()
-+
-+
-+## variables that apply to all packages
-+SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OSSIM_VERSION}")
-+
-+IF(NOT CPACK_GENERATOR)
-+ # these goes for all platforms. Setting these stops the CPack.cmake script from generating options about other package compression formats (.z .tz, etc.)
-+ IF(WIN32)
-+ SET(CPACK_GENERATOR "ZIP")
-+ SET(CPACK_SOURCE_GENERATOR "ZIP")
-+ ELSEIF(APPLE)
-+# SET(CPACK_GENERATOR "PackageMaker")
-+# SET(CPACK_SOURCE_GENERATOR "PackageMaker")
-+ SET(CPACK_GENERATOR "TGZ")
-+ SET(CPACK_SOURCE_GENERATOR "TGZ")
-+ ELSE()
-+ SET(CPACK_GENERATOR "TGZ")
-+ SET(CPACK_SOURCE_GENERATOR "TGZ")
-+ ENDIF()
-+ENDIF(NOT CPACK_GENERATOR)
-+
-+# for ms visual studio we use it's internally defined variable to get the configuration (debug,release, ...)
-+IF(MSVC_IDE)
-+ SET(OSSIM_CPACK_CONFIGURATION "$(OutDir)")
-+ SET(PACKAGE_TARGET_PREFIX "Package ")
-+ELSE()
-+ # on un*x an empty CMAKE_BUILD_TYPE means release
-+ IF(CMAKE_BUILD_TYPE)
-+ SET(OSSIM_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE})
-+ ELSE()
-+ SET(OSSIM_CPACK_CONFIGURATION "Release")
-+ ENDIF()
-+ SET(PACKAGE_TARGET_PREFIX "package_")
-+ENDIF()
-+
-+# Get all defined components
-+GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL COMPONENTS)
-+IF(NOT CPACK_COMPONENTS_ALL)
-+ # cmake 2.6.0 don't supply the COMPONENTS property.
-+ # I set it manually to be the packages that can always be packaged
-+ MESSAGE("When building packages please consider using cmake version 2.6.1 or above")
-+ SET(CPACK_COMPONENTS_ALL ossim)
-+ENDIF()
-+
-+# Create a target that will be used to generate all packages defined below
-+SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL")
-+ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME})
-+
-+MACRO(GENERATE_PACKAGING_TARGET package_name)
-+ SET(CPACK_PACKAGE_NAME ${package_name})
-+
-+ # the doc packages don't need a system-arch specification
-+ IF(${package} MATCHES -doc)
-+ SET(OSSIM_PACKAGE_FILE_NAME ${package_name}-${OSSIM_VERSION})
-+ ELSE()
-+ SET(OSSIM_PACKAGE_FILE_NAME ${package_name}-${OSSIM_VERSION}-${OSSIM_CPACK_SYSTEM_SPEC_STRING}-${OSSIM_CPACK_CONFIGURATION})
-+ IF(NOT BUILD_SHARED_LIBS)
-+ SET(OSSIM_PACKAGE_FILE_NAME ${OSSIM_PACKAGE_FILE_NAME}-static)
-+ ENDIF()
-+ ENDIF()
-+
-+ CONFIGURE_FILE("${${PROJECT_NAME}_SOURCE_DIR}/CMakeModules/OssimCPackConfig.cmake.in" "${${PROJECT_NAME}_BINARY_DIR}/CPackConfig-${package_name}.cmake" IMMEDIATE)
-+
-+ SET(PACKAGE_TARGETNAME "${PACKAGE_TARGET_PREFIX}${package_name}")
-+
-+ # This is naive and will probably need fixing eventually
-+ IF(MSVC)
-+ SET(MOVE_COMMAND "move")
-+ ELSE()
-+ SET(MOVE_COMMAND "mv")
-+ ENDIF()
-+
-+ IF(NOT ACHIVE_EXT)
-+ # Set in and out archive filenames. Windows = zip, others = tgz
-+ IF(WIN32)
-+ SET(ARCHIVE_EXT "zip")
-+ ELSEIF(APPLE)
-+# SET(ARCHIVE_EXT "dmg")
-+ SET(ARCHIVE_EXT "tar.gz")
-+ ELSE()
-+ SET(ARCHIVE_EXT "tar.gz")
-+ ENDIF()
-+ ENDIF(NOT ACHIVE_EXT)
-+
-+ # Create a target that creates the current package
-+ # and rename the package to give it proper filename
-+ ADD_CUSTOM_TARGET(${PACKAGE_TARGETNAME})
-+ ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_TARGETNAME}
-+ COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSSIM_CPACK_CONFIGURATION} --config ${${PROJECT_NAME}_BINARY_DIR}/CPackConfig-${package_name}.cmake
-+ COMMAND "${MOVE_COMMAND}" "${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}" "${OSSIM_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-+ COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT} -> ${OSSIM_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-+ COMMENT "Run CPack packaging for ${package_name}..."
-+ )
-+ # Add the exact same custom command to the all package generating target.
-+ # I can't use add_dependencies to do this because it would allow parallel building of packages so am going brute here
-+ ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_ALL_TARGETNAME}
-+ COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSSIM_CPACK_CONFIGURATION} --config ${${PROJECT_NAME}_BINARY_DIR}/CPackConfig-${package_name}.cmake
-+ COMMAND "${MOVE_COMMAND}" "${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}" "${OSSIM_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-+ COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT} -> ${OSSIM_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-+ )
-+ENDMACRO(GENERATE_PACKAGING_TARGET)
-+
-+# Create configs and targets for a package including all components
-+SET(OSSIM_CPACK_COMPONENT ALL)
-+GENERATE_PACKAGING_TARGET(ossim-all)
-+
-+# Create configs and targets for each component
-+FOREACH(package ${CPACK_COMPONENTS_ALL})
-+ SET(OSSIM_CPACK_COMPONENT ${package})
-+ GENERATE_PACKAGING_TARGET(${package})
-+ENDFOREACH()
---- /dev/null
-+++ b/ossim/CMakeModules/OssimCPackConfig.cmake.in
-@@ -0,0 +1,73 @@
-+# This file will be configured to contain variables for CPack. These variables
-+# should be set in the CMake list file of the project before CPack module is
-+# included. Example variables are:
-+# CPACK_GENERATOR - Generator used to create package
-+# CPACK_INSTALL_CMAKE_PROJECTS - For each project (path, name, component)
-+# CPACK_CMAKE_GENERATOR - CMake Generator used for the projects
-+# CPACK_INSTALL_COMMANDS - Extra commands to install components
-+# CPACK_INSTALL_DIRECTORIES - Extra directories to install
-+# CPACK_PACKAGE_DESCRIPTION_FILE - Description file for the package
-+# CPACK_PACKAGE_DESCRIPTION_SUMMARY - Summary of the package
-+# CPACK_PACKAGE_EXECUTABLES - List of pairs of executables and labels
-+# CPACK_PACKAGE_FILE_NAME - Name of the package generated
-+# CPACK_PACKAGE_ICON - Icon used for the package
-+# CPACK_PACKAGE_INSTALL_DIRECTORY - Name of directory for the installer
-+# CPACK_PACKAGE_NAME - Package project name
-+# CPACK_PACKAGE_VENDOR - Package project vendor
-+# CPACK_PACKAGE_VERSION - Package project version
-+# CPACK_PACKAGE_VERSION_MAJOR - Package project version (major)
-+# CPACK_PACKAGE_VERSION_MINOR - Package project version (minor)
-+# CPACK_PACKAGE_VERSION_PATCH - Package project version (patch)
-+
-+# There are certain generator specific ones
-+
-+# NSIS Generator:
-+# CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Name of the registry key for the installer
-+# CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra commands used during uninstall
-+# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra commands used during install
-+
-+
-+SET(CPACK_BINARY_BUNDLE "${CPACK_BINARY_BUNDLE}")
-+SET(CPACK_BINARY_CYGWIN "${CPACK_BINARY_CYGWIN}")
-+SET(CPACK_BINARY_DEB "${CPACK_BINARY_DEB}")
-+SET(CPACK_BINARY_NSIS "${CPACK_BINARY_NSIS}")
-+SET(CPACK_BINARY_OSXX11 "${CPACK_BINARY_OSXX11}")
-+SET(CPACK_BINARY_PACKAGEMAKER "${CPACK_BINARY_PACKAGEMAKER}")
-+SET(CPACK_BINARY_RPM "${CPACK_BINARY_RPM}")
-+SET(CPACK_BINARY_STGZ "${CPACK_BINARY_STGZ}")
-+SET(CPACK_BINARY_TBZ2 "${CPACK_BINARY_TBZ2}")
-+SET(CPACK_BINARY_TGZ "${CPACK_BINARY_TGZ}")
-+SET(CPACK_BINARY_TZ "${CPACK_BINARY_TZ}")
-+SET(CPACK_BINARY_ZIP "${CPACK_BINARY_ZIP}")
-+SET(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
-+SET(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}")
-+SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
-+SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-+SET(CPACK_GENERATOR "${CPACK_GENERATOR}")
-+SET(CPACK_INSTALL_CMAKE_PROJECTS "${${PROJECT_NAME}_BINARY_DIR};ossim;${OSSIM_CPACK_COMPONENT};/")
-+SET(CPACK_INSTALL_PREFIX "${CPACK_INSTALL_PREFIX}")
-+SET(CPACK_MODULE_PATH "${${PROJECT_NAME}_SOURCE_DIR}/CMakeModules;")
-+SET(CPACK_NSIS_DISPLAY_NAME "${CMAKE_PROJECT_NAME} ${OSSIM_VERSION}")
-+SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
-+SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
-+SET(CPACK_OUTPUT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CPackConfig-${OSSIM_CPACK_COMPONENT}.cmake")
-+SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${${PROJECT_NAME}_SOURCE_DIR}/README.txt")
-+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OSSIM is an open source high performance sensor modeling and image processing library")
-+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
-+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CMAKE_PROJECT_NAME}-${OSSIM_VERSION}")
-+SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
-+SET(CPACK_PACKAGE_RELOCATABLE "true")
-+SET(CPACK_PACKAGE_VENDOR "OSSIM")
-+SET(CPACK_PACKAGE_VERSION "${OSSIM_VERSION}")
-+SET(CPACK_PACKAGE_VERSION_MAJOR "${OSSIM_MAJOR_VERSION}")
-+SET(CPACK_PACKAGE_VERSION_MINOR "${OSSIM_MINOR_VERSION}")
-+SET(CPACK_PACKAGE_VERSION_PATCH "${OSSIM_PATCH_VERSION}")
-+SET(CPACK_RESOURCE_FILE_LICENSE "${${PROJECT_NAME}_SOURCE_DIR}/LICENSE.txt")
-+SET(CPACK_RESOURCE_FILE_README "${${PROJECT_NAME}_SOURCE_DIR}/README.txt")
-+SET(CPACK_RESOURCE_FILE_WELCOME "${${PROJECT_NAME}_SOURCE_DIR}/NEWS.txt")
-+SET(CPACK_SET_DESTDIR "OFF")
-+SET(CPACK_STRIP_FILES "ON")
-+SET(CPACK_RPM_PACKAGE_DEBUG "1")
-+SET(CPACK_OSX_PACKAGE_VERSION "10.6")
---- /dev/null
-+++ b/ossim/CMakeModules/OssimCommonVariables.cmake
-@@ -0,0 +1,258 @@
-+##################################################################################
-+# This currently sets up the options for the WARNING FLAGS for the compiler we are generating for.
-+# Currently only have gnu
-+##################################################################################
-+MACRO(OSSIM_ADD_COMMON_LIBRARY_FLAGS)
-+ OPTION(OSSIM_COMPILE_WITH_FULL_WARNING "OSSIM developers : Compilation with FULL warning (use only for ossim developers)." OFF)
-+ MARK_AS_ADVANCED(OSSIM_COMPILE_WITH_FULL_WARNING)
-+
-+ IF(OSSIM_COMPILE_WITH_FULL_WARNING)
-+ IF(CMAKE_COMPILER_IS_GNUCXX)
-+ SET(OSSIM_COMMON_COMPILER_FLAGS "${OSSIM_COMMON_COMPILER_FLAGS} -Wall -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wuninitialized -Wsign-compare -Wparentheses -Wunknown-pragmas -Wswitch" CACHE STRING "List of compilation parameters.")
-+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-+ ENDIF(OSSIM_COMPILE_WITH_FULL_WARNING)
-+
-+ IF(WIN32)
-+ #---
-+ # This option is to enable the /MP to compile multiple source files by using
-+ # multiple processes.
-+ #---
-+ OPTION(WIN32_USE_MP "Set to ON to build OSSIM with the /MP option (Visual Studio 2005 and above)." OFF)
-+ MARK_AS_ADVANCED(WIN32_USE_MP)
-+ IF(WIN32_USE_MP)
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-+ ENDIF(WIN32_USE_MP)
-+
-+ set(OSSIM_COMMON_COMPILER_FLAGS "${OSSIM_COMMON_COMPILER_FLAGS} -DNOMINMAX -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE")
-+
-+ set(DEBUG_BUILD OFF)
-+ IF(CMAKE_BUILD_TYPE)
-+ string ( COMPARE EQUAL ${CMAKE_BUILD_TYPE} "Debug" DEBUG_BUILD )
-+ ENDIF(CMAKE_BUILD_TYPE)
-+
-+ ###
-+ # Currently must set /FORCE:MULTIPLE for Visual Studio 2010. 29 October 2010 - drb
-+ ###
-+
-+ IF(MSVC)
-+ message("MSVC_VERSION: ${MSVC_VERSION}")
-+
-+ if( (${MSVC_VERSION} EQUAL 1600) OR (${MSVC_VERSION} EQUAL 1700) )
-+ if (DEBUG_BUILD)
-+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRT /FORCE:MULTIPLE /MANIFEST:NO")
-+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /FORCE:MULTIPLE /MANIFEST:NO")
-+
-+ else ( )
-+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /FORCE:MULTIPLE /MANIFEST:NO")
-+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /FORCE:MULTIPLE /MANIFEST:NO")
-+ endif (DEBUG_BUILD)
-+
-+ SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD /FORCE:MULTIPLE")
-+ else( )
-+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMTD")
-+ endif( (${MSVC_VERSION} EQUAL 1600) OR (${MSVC_VERSION} EQUAL 1700) )
-+ ENDIF(MSVC)
-+ ENDIF(WIN32)
-+
-+ OPTION(OSSIM_ADD_FPIC "Compilation with FPIC flag if static library. The default is on since we have plugins that need to be shared." ON)
-+ MARK_AS_ADVANCED(OSSIM_ADD_FPIC)
-+ IF(OSSIM_ADD_FPIC)
-+ IF(UNIX AND NOT BUILD_SHARED_LIBS)
-+ STRING(REGEX MATCH "fPIC" REG_MATCHED "${OSSIM_COMMON_COMPILER_FLAGS}")
-+ if(NOT REG_MATCHED)
-+ set(OSSIM_COMMON_COMPILER_FLAGS "${OSSIM_COMMON_COMPILER_FLAGS} -fPIC")
-+ endif(NOT REG_MATCHED)
-+ ENDIF(UNIX AND NOT BUILD_SHARED_LIBS)
-+ ENDIF(OSSIM_ADD_FPIC)
-+
-+ MARK_AS_ADVANCED(OSSIM_COMMON_COMPILER_FLAGS)
-+ENDMACRO(OSSIM_ADD_COMMON_LIBRARY_FLAGS)
-+
-+MACRO(OSSIM_ADD_COMMON_SETTINGS)
-+ ###################################################################################
-+ # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
-+ # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-+ # These are just defaults/recommendations, but how we want to build
-+ # out of the box. But the user needs to be able to change these options.
-+ # So we must only set the values the first time CMake is run, or we
-+ # will overwrite any changes the user sets.
-+ # FORCE is used because the options are not reflected in the UI otherwise.
-+ # Seems like a good place to add version specific compiler flags too.
-+ ###################################################################################
-+ IF(APPLE)
-+ # use, i.e. 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}")
-+
-+ # 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}" isSystemDir)
-+
-+ IF("${isSystemDir}" STREQUAL "-1")
-+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}")
-+ ENDIF("${isSystemDir}" STREQUAL "-1")
-+
-+ SET(TEMP_CMAKE_OSX_ARCHITECTURES "")
-+ SET(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
-+ # This is really fragile, but CMake doesn't provide the OS system
-+ # version information we need. (Darwin versions can be changed
-+ # independently of OS X versions.)
-+ # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
-+ IF(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
-+ SET(TEMP_CMAKE_OSX_ARCHITECTURES "i386;x86_64")
-+ IF(NOT ("${CMAKE_CXX_FLAGS}" MATCHES "mmacosx-version-min"))
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types.")
-+ ENDIF()
-+ ELSEIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-+ # 64-bit compiles are not supported with Carbon. We should enable
-+ SET(TEMP_CMAKE_OSX_ARCHITECTURES "i386;x86_64")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types.")
-+ ELSEIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-+ SET(TEMP_CMAKE_OSX_ARCHITECTURES "i386;ppc")
-+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types.")
-+ ELSE()
-+ # No Universal Binary support
-+ # Should break down further to set the -mmacosx-version-min,
-+ # but the SDK detection is too unreliable here.
-+ ENDIF()
-+ IF(NOT CMAKE_OSX_ARCHITECTURES)
-+ SET(CMAKE_OSX_ARCHITECTURES "${TEMP_CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Build architectures for OSX" FORCE)
-+ ENDIF()
-+ OPTION(OSSIM_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
-+
-+ MARK_AS_ADVANCED(CMAKE_OSX_ARCHITECTURES)
-+ MARK_AS_ADVANCED(CMAKE_CXX_FLAGS)
-+ MARK_AS_ADVANCED(CMAKE_OSX_SYSROOT)
-+ MARK_AS_ADVANCED(OSSIM_BUILD_APPLICATION_BUNDLES)
-+ ENDIF(APPLE)
-+
-+ SET(MAKE_APPENDS_BUILD_TYPE "NO")
-+ IF(CMAKE_GENERATOR)
-+ STRING(TOUPPER ${CMAKE_GENERATOR} CMAKE_GENERATOR_TEST_UPPER)
-+ STRING(COMPARE EQUAL "${CMAKE_GENERATOR_TEST_UPPER}" "XCODE" CMAKE_GENERATOR_TEST)
-+ IF(CMAKE_GENERATOR_TEST)
-+ SET(MAKE_APPENDS_BUILD_TYPE "YES")
-+ ELSE()
-+ STRING(COMPARE NOTEQUAL "." "${CMAKE_CFG_INTDIR}" CMAKE_GENERATOR_TEST)
-+ IF(CMAKE_GENERATOR_TEST)
-+ SET(MAKE_APPENDS_BUILD_TYPE "YES")
-+ ENDIF()
-+ ENDIF()
-+ ENDIF(CMAKE_GENERATOR)
-+ OSSIM_ADD_COMMON_LIBRARY_FLAGS()
-+
-+ # Dynamic vs Static Linking
-+ OPTION(BUILD_SHARED_LIBS "Set to ON to build OSSIM for dynamic linking. Use OFF for static." ON)
-+ OPTION(BUILD_OSSIM_FRAMEWORKS "Set to ON to build OSSIM for framework if BUILD_SHARED_LIBS is on. Use OFF for dylib if BUILD_SHARED_LIBS is on." ON)
-+ IF(BUILD_SHARED_LIBS)
-+ SET(OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
-+ ELSE ()
-+ SET(OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
-+ ENDIF()
-+
-+# IF(NOT OSSIM_LIBRARY_BUILD_OUTPUT_DIRECTORY)
-+# SET(OSSIM_LIBRARY_BUILD_OUTPUT_DIRECTORY ${${PROJECT_NAME}_SOURCE_DIR}/lib)
-+# ENDIF(NOT OSSIM_LIBRARY_BUILD_OUTPUT_DIRECTORY)
-+# IF(NOT OSSIM_RUNTIME_BUILD_OUTPUT_DIRECTORY)
-+# SET(OSSIM_RUNTIME_BUILD_OUTPUT_DIRECTORY ${${PROJECT_NAME}_SOURCE_DIR}/bin)
-+# ENDIF(NOT OSSIM_RUNTIME_BUILD_OUTPUT_DIRECTORY)
-+
-+ IF(MAKE_APPENDS_BUILD_TYPE)
-+ SET(BUILD_FRAMEWORK_DIR "")
-+ SET(BUILD_RUNTIME_DIR "")
-+ SET(BUILD_LIBRARY_DIR "")
-+ SET(BUILD_ARCHIVE_DIR "")
-+ SET(BUILD_INCLUDE_DIR "include")
-+ ELSE()
-+ IF(NOT DEFINED BUILD_FRAMEWORK_DIR)
-+ SET(BUILD_FRAMEWORK_DIR "${CMAKE_BUILD_TYPE}")
-+ ENDIF()
-+ IF(NOT DEFINED BUILD_RUNTIME_DIR)
-+ SET(BUILD_RUNTIME_DIR "${CMAKE_BUILD_TYPE}")
-+ ENDIF()
-+ IF(NOT DEFINED BUILD_LIBRARY_DIR)
-+ SET(BUILD_LIBRARY_DIR "${CMAKE_BUILD_TYPE}")
-+ ENDIF()
-+ IF(NOT DEFINED BUILD_ARCHIVE_DIR)
-+ SET(BUILD_ARCHIVE_DIR "${CMAKE_BUILD_TYPE}")
-+ ENDIF()
-+ IF(NOT DEFINED BUILD_INCLUDE_DIR)
-+ SET(BUILD_INCLUDE_DIR "include")
-+ ENDIF()
-+ ENDIF()
-+
-+ SET(INSTALL_FRAMEWORK_DIR "Frameworks")
-+ SET(INSTALL_RUNTIME_DIR "bin")
-+ SET(INSTALL_INCLUDE_DIR "include")
-+
-+ # Libraries and archives go to lib or lib64.
-+ get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-+ if(LIB64)
-+ set(LIBSUFFIX 64)
-+ else()
-+ set(LIBSUFFIX "")
-+ endif()
-+ set(INSTALL_LIBRARY_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries")
-+ set(INSTALL_ARCHIVE_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for archive")
-+ mark_as_advanced(LIBSUFFIX)
-+ mark_as_advanced(INSTALL_LIBRARY_DIR)
-+ mark_as_advanced(INSTALL_ARCHIVE_DIR)
-+
-+ IF(WIN32)
-+ IF(NOT DEFINED CMAKE_DEBUG_POSTFIX)
-+ SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Debug variable used to add the postfix to dll's and exe's. Defaults to 'd' on WIN32 builds and empty on all other platforms" FORCE)
-+ ENDIF()
-+ ENDIF()
-+ IF(NOT CMAKE_BUILD_TYPE)
-+ SET(CMAKE_BUILD_TYPE Release)
-+ ENDIF(NOT CMAKE_BUILD_TYPE)
-+
-+ # force some variables that could be defined in the command line to be written to cache
-+ SET( CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH
-+ "Where to install ${PROJECT_NAME}" FORCE )
-+ SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
-+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )
-+ SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" CACHE PATH
-+ "Path to custom CMake Modules" FORCE )
-+ SET( INSTALL_DOC "${INSTALL_DOC}" CACHE BOOL
-+ "Set to OFF to skip build/install Documentation" FORCE )
-+
-+ IF(NOT OSSIM_DEV_HOME)
-+ SET(OSSIM_DEV_HOME "$ENV{OSSIM_DEV_HOME}")
-+ GET_FILENAME_COMPONENT(OSSIM_DEV_HOME "${OSSIM_DEV_HOME}" ABSOLUTE)
-+ ENDIF(NOT OSSIM_DEV_HOME)
-+ IF(NOT CMAKE_INSTALL_PREFIX)
-+ SET(CMAKE_INSTALL_PREFIX "$ENV{OSSIM_INSTALL_PREFIX}")
-+ GET_FILENAME_COMPONENT(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
-+ ENDIF(NOT CMAKE_INSTALL_PREFIX)
-+ IF(NOT OSSIM_DEPENDENCIES)
-+ SET(OSSIM_DEPENDENCIES "$ENV{OSSIM_DEPENDENCIES}")
-+ GET_FILENAME_COMPONENT(OSSIM_DEPENDENCIES "${OSSIM_DEPENDENCIES}" ABSOLUTE)
-+ ENDIF(NOT OSSIM_DEPENDENCIES)
-+
-+ #################################### ADd some common options for all modules to use ###################################
-+ OPTION(BUILD_OSSIMC "Set to ON to build the ossim c api interfaces. Use OFF to skip this module." OFF)
-+ OPTION(BUILD_OSSIMPREDATOR "Set to ON to build the Predator video decoding library. Use OFF to skip this module." ON)
-+ OPTION(BUILD_OSSIMPLANET "Set to ON to build the 3-D visualization module. Use OFF to skip this module." ON)
-+ OPTION(BUILD_OSSIMPLANETQT "Set to ON to build the 3-D visualization Qt GUI module. Use OFF to skip this module." ON)
-+ OPTION(BUILD_OSSIMQT4 "Set to ON to build the 2-D Qt4 GUI." ON)
-+ OPTION(BUILD_OSSIMGUI "Set to ON to build the new ossimGui library and geocell application." ON)
-+ OPTION(BUILD_CSMAPI "Set to ON to build the csm api library." ON)
-+ OPTION(BUILD_OMS "Set to ON to build the oms api library." ON)
-+ OPTION(BUILD_WMS "Set to ON to build the wms api library." ON)
-+
-+
-+ENDMACRO(OSSIM_ADD_COMMON_SETTINGS)
-+
-+
-+OSSIM_ADD_COMMON_SETTINGS()
-+
---- /dev/null
-+++ b/ossim/CMakeModules/OssimDetermineCompiler.cmake
-@@ -0,0 +1,77 @@
-+# - If Visual Studio is being used, this script sets the variable OSG_COMPILER
-+# The principal reason for this is due to MSVC 8.0 SP0 vs SP1 builds.
-+#
-+# Variable:
-+# OSG_COMPILER
-+#
-+
-+# Not currently used...
-+#IF(CMAKE_COMPILER_IS_GNUCXX)
-+# EXEC_PROGRAM(
-+# ${CMAKE_CXX_COMPILER}
-+# ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-+# OUTPUT_VARIABLE gcc_compiler_version
-+# )
-+# #MESSAGE("GCC Version: ${gcc_compiler_version}")
-+
-+IF(MSVC60)
-+ SET(OSG_COMPILER "vc60")
-+ELSEIF(MSVC70)
-+ SET(OSG_COMPILER "vc70")
-+ELSEIF(MSVC71)
-+ SET(OSG_COMPILER "vc71")
-+ELSEIF(MSVC80)
-+ SET(OSG_COMPILER "vc80")
-+ELSEIF(MSVC90)
-+ SET(OSG_COMPILER "vc90")
-+ELSEIF(MSVC100)
-+ SET(OSG_COMPILER "vc100")
-+ENDIF()
-+
-+MESSAGE("OSG_COMPILER ${OSG_COMPILER}")
-+
-+IF(MSVC80)
-+ MESSAGE(STATUS "Checking if compiler has service pack 1 installed...")
-+ FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n")
-+
-+ TRY_COMPILE(_TRY_RESULT
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx
-+ CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON
-+ OUTPUT_VARIABLE OUTPUT
-+ )
-+
-+ IF(_TRY_RESULT)
-+ # parse for exact compiler version
-+ STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}")
-+ IF(vc_compiler_version)
-+ #MESSAGE("${vc_compiler_version}")
-+ STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}")
-+ LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION)
-+ LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION)
-+ LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION)
-+ LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION)
-+ ENDIF(vc_compiler_version)
-+
-+ # Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2?
-+ # Standard vc90 is 9.0.30729.1, sp1 ?
-+ IF(CL_EXTRA_VERSION EQUAL 762)
-+ SET(OSG_COMPILER "vc80sp1")
-+ ELSE(CL_EXTRA_VERSION EQUAL 762)
-+ SET(OSG_COMPILER "vc80")
-+ ENDIF(CL_EXTRA_VERSION EQUAL 762)
-+
-+ # parse for exact visual studio version
-+ #IF(MSVC_IDE)
-+ # string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}")
-+ # IF(vs_version)
-+ # MESSAGE("${vs_version}")
-+ # string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}")
-+ # list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION)
-+ # list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION)
-+ # list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION)
-+ # list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION)
-+ # ENDIF(vs_version)
-+ #ENDIF(MSVC_IDE)
-+ ENDIF(_TRY_RESULT)
-+ENDIF(MSVC80)
---- /dev/null
-+++ b/ossim/CMakeModules/OssimQt4Macros.cmake
-@@ -0,0 +1,24 @@
-+include(Qt4Macros)
-+MACRO (OSSIM_QT4_WRAP_UI outfiles)
-+
-+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
-+ QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-+ else()
-+ QT4_EXTRACT_OPTIONS(ui_files ui_options "" ${ARGN})
-+ endif()
-+ FOREACH (it ${ui_files})
-+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-+ IF(UI_DESTINATION_DIR)
-+ SET(outfile ${UI_DESTINATION_DIR}/ui_${outfile}.h)
-+ ELSE(UI_DESTINATION_DIR)
-+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
-+ ENDIF(UI_DESTINATION_DIR)
-+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-+ COMMAND ${QT_UIC_EXECUTABLE}
-+ ARGS ${ui_options} -o ${outfile} ${infile}
-+ MAIN_DEPENDENCY ${infile})
-+ SET(${outfiles} ${${outfiles}} ${outfile})
-+ ENDFOREACH (it)
-+
-+ENDMACRO (OSSIM_QT4_WRAP_UI)
---- /dev/null
-+++ b/ossim/CMakeModules/OssimQt5Macros.cmake
-@@ -0,0 +1,19 @@
-+include(Qt5Macros)
-+MACRO (OSSIM_QT_WRAP_UI outfiles)
-+ QT5_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-+ FOREACH (it ${ui_files})
-+ GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-+ GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-+ IF(UI_DESTINATION_DIR)
-+ SET(outfile ${UI_DESTINATION_DIR}/ui_${outfile}.h)
-+ ELSE(UI_DESTINATION_DIR)
-+ SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
-+ ENDIF(UI_DESTINATION_DIR)
-+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-+ COMMAND ${QT_UIC_EXECUTABLE}
-+ ARGS ${ui_options} -o ${outfile} ${infile}
-+ MAIN_DEPENDENCY ${infile})
-+ SET(${outfiles} ${${outfiles}} ${outfile})
-+ ENDFOREACH (it)
-+
-+ENDMACRO (OSSIM_QT_WRAP_UI)
---- /dev/null
-+++ b/ossim/CMakeModules/OssimUtilities.cmake
-@@ -0,0 +1,359 @@
-+#################################################################################
-+# This was taken from the http://www.cmake.org/Wiki/CMakeMacroParseArguments
-+#################################################################################
-+MACRO(OSSIM_PARSE_ARGUMENTS prefix arg_names option_names)
-+ SET(DEFAULT_ARGS)
-+ FOREACH(arg_name ${arg_names})
-+ SET(${prefix}_${arg_name})
-+ ENDFOREACH(arg_name)
-+ FOREACH(option ${option_names})
-+ SET(${prefix}_${option} FALSE)
-+ ENDFOREACH(option)
-+
-+ SET(current_arg_name DEFAULT_ARGS)
-+ SET(current_arg_list)
-+ FOREACH(arg ${ARGN})
-+ SET(larg_names ${arg_names})
-+ LIST(FIND larg_names "${arg}" is_arg_name)
-+ IF (is_arg_name GREATER -1)
-+ SET(${prefix}_${current_arg_name} ${current_arg_list})
-+ SET(current_arg_name ${arg})
-+ SET(current_arg_list)
-+ ELSE (is_arg_name GREATER -1)
-+ SET(loption_names ${option_names})
-+ LIST(FIND loption_names "${arg}" is_option)
-+ IF (is_option GREATER -1)
-+ SET(${prefix}_${arg} TRUE)
-+ ELSE (is_option GREATER -1)
-+ SET(current_arg_list ${current_arg_list} ${arg})
-+ ENDIF (is_option GREATER -1)
-+ ENDIF (is_arg_name GREATER -1)
-+ ENDFOREACH(arg)
-+ SET(${prefix}_${current_arg_name} ${current_arg_list})
-+ENDMACRO(OSSIM_PARSE_ARGUMENTS)
-+
-+##############################################################################################
-+# This was taken from http://www.cmake.org/Wiki/CMakeMacroListOperations#CAR_and_CDR
-+##############################################################################################
-+MACRO(OSSIM_CAR var)
-+ SET(${var} ${ARGV1})
-+ENDMACRO(OSSIM_CAR)
-+
-+#############################################################################################
-+# This was taken from http://www.cmake.org/Wiki/CMakeMacroListOperations#CAR_and_CDR
-+#############################################################################################
-+MACRO(OSSIM_CDR var junk)
-+ SET(${var} ${ARGN})
-+ENDMACRO(OSSIM_CDR)
-+
-+#################################################################################
-+# MACRO: TODAYS_DATE
-+#
-+# DESCRIPTION:
-+# MACRO FOR GETTING THE DATE AND TIME INFORMATION
-+#################################################################################
-+MACRO (TODAYS_DATE RESULT)
-+ string(TIMESTAMP ${RESULT} "%Y%m%d" UTC)
-+ENDMACRO (TODAYS_DATE)
-+
-+#################################################################################
-+# MACRO: GET_SVN_REVISION
-+#
-+# DESCRIPTION:
-+# MACRO FOR GETTING THE SVN revision for this build
-+#################################################################################
-+MACRO (GET_SVN_REVISION)
-+ FIND_PACKAGE(Subversion)
-+ IF(SUBVERSION_FOUND)
-+ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-+ # MESSAGE("Current revision is ${Project_WC_REVISION}")
-+ # Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
-+ # MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
-+ ENDIF()
-+ENDMACRO(GET_SVN_REVISION)
-+
-+MACRO(LINK_EXTERNAL TRGTNAME)
-+ FOREACH(LINKLIB ${ARGN})
-+ TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" )
-+ ENDFOREACH(LINKLIB)
-+ENDMACRO(LINK_EXTERNAL TRGTNAME)
-+
-+MACRO(LINK_INTERNAL TRGTNAME)
-+ IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-+ TARGET_LINK_LIBRARIES(${TRGTNAME} ${ARGN})
-+ ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-+ FOREACH(LINKLIB ${ARGN})
-+ IF(MSVC AND OSSIM_MSVC_VERSIONED_DLL)
-+ #when using versioned names, the .dll name differ from .lib name, there is a problem with that:
-+ #CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX for computing linkage info to use into projects,
-+ # so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
-+ #to library targets used
-+ TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_RELEASE_POSTFIX}.lib" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}.lib")
-+ ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
-+ ELSE(MSVC AND OSSIM_MSVC_VERSIONED_DLL)
-+ TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}${CMAKE_RELEASE_POSTFIX}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-+ ENDIF(MSVC AND OSSIM_MSVC_VERSIONED_DLL)
-+ ENDFOREACH(LINKLIB)
-+ ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-+ENDMACRO(LINK_INTERNAL TRGTNAME)
-+
-+######################################################################
-+#
-+# This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plugins
-+# kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES
-+# they are combined in a single list checked for unicity
-+# the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
-+#
-+# a second variable TARGET_EXTERNAL_LIBRARIES hold the list of libraries not differentiated between debug and optimized
-+##################################################################################
-+MACRO(SETUP_LINK_LIBRARIES)
-+ SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
-+
-+ FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES})
-+ SET(TO_INSERT TRUE)
-+ FOREACH (value ${TARGET_COMMON_LIBRARIES})
-+ IF (${value} STREQUAL ${LINKLIB})
-+ SET(TO_INSERT FALSE)
-+ ENDIF (${value} STREQUAL ${LINKLIB})
-+ ENDFOREACH (value ${TARGET_COMMON_LIBRARIES})
-+ IF(TO_INSERT)
-+ LIST(APPEND TARGET_LIBRARIES ${LINKLIB})
-+ ENDIF(TO_INSERT)
-+ ENDFOREACH(LINKLIB)
-+
-+ LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
-+ TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${TARGET_EXTERNAL_LIBRARIES})
-+ IF(TARGET_LIBRARIES_VARS)
-+ LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
-+ ENDIF(TARGET_LIBRARIES_VARS)
-+ENDMACRO(SETUP_LINK_LIBRARIES)
-+
-+
-+MACRO(OSSIM_SETUP_APPLICATION)
-+ OSSIM_PARSE_ARGUMENTS(APPLICATION
-+ "COMPONENT_NAME;SOURCE_FILES;HEADERS;TARGET_NAME;TARGET_LABEL"
-+ "COMMAND_LINE;INSTALL;REQUIRE_WINMAIN_FLAG"
-+ ${ARGN})
-+ OSSIM_CAR(APPLICATION_NAME "${APPLICATION_DEFAULT_ARGS}")
-+ OSSIM_CDR(APPLICATION_SOURCES "${APPLICATION_DEFAULT_ARGS}")
-+ SET(TARGET_NAME ${APPLICATION_NAME})
-+ SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${APPLICATION_NAME}")
-+ IF(APPLICATION_TARGET_NAME)
-+ set(TARGET_TARGETNAME "${APPLICATION_TARGET_NAME}")
-+ ENDIF(APPLICATION_TARGET_NAME)
-+
-+ SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${APPLICATION_NAME}")
-+ IF(APPLICATION_TARGET_LABEL)
-+ SET(TARGET_LABEL "${APPLICATION_TARGET_LABEL}")
-+ ENDIF(APPLICATION_TARGET_LABEL)
-+
-+ IF(APPLICATION_COMMAND_LINE)
-+ ADD_EXECUTABLE(${TARGET_TARGETNAME} ${APPLICATION_SOURCE_FILES} ${APPLICATION_HEADERS})
-+
-+ ELSE(APPLICATION_COMMAND_LINE)
-+ IF(APPLE)
-+ # SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${OSSIM_MAJOR_VERSION}.${OSSIM_MINOR_VERSION}.${OSSIM_PATCH_VERSION}")
-+ # Short Version is the "marketing version". It is the version
-+ # the user sees in an information panel.
-+ SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${OSSIM_MAJOR_VERSION}.${OSSIM_MINOR_VERSION}.${OSSIM_PATCH_VERSION}")
-+ # Bundle version is the version the OS looks at.
-+ SET(MACOSX_BUNDLE_BUNDLE_VERSION "${OSSIM_MAJOR_VERSION}.${OSSIM_MINOR_VERSION}.${OSSIM_PATCH_VERSION}")
-+ SET(MACOSX_BUNDLE_GUI_IDENTIFIER "org.ossim.${TARGET_TARGETNAME}" )
-+ SET(MACOSX_BUNDLE_BUNDLE_NAME "${TARGET_TARGETNAME}" )
-+ # SET(MACOSX_BUNDLE_ICON_FILE "myicon.icns")
-+ # SET(MACOSX_BUNDLE_COPYRIGHT "")
-+ # SET(MACOSX_BUNDLE_INFO_STRING "Info string, localized?")
-+ ENDIF(APPLE)
-+
-+ IF(WIN32)
-+ IF (APPLICATION_REQUIRE_WINMAIN_FLAG)
-+ SET(PLATFORM_SPECIFIC_CONTROL WIN32)
-+ ENDIF (APPLICATION_REQUIRE_WINMAIN_FLAG)
-+ ENDIF(WIN32)
-+
-+ IF(APPLE)
-+ IF(OSSIM_BUILD_APPLICATION_BUNDLES)
-+ SET(PLATFORM_SPECIFIC_CONTROL MACOSX_BUNDLE)
-+ ENDIF(OSSIM_BUILD_APPLICATION_BUNDLES)
-+ ENDIF(APPLE)
-+
-+ ADD_EXECUTABLE(${TARGET_TARGETNAME} ${PLATFORM_SPECIFIC_CONTROL} ${APPLICATION_SOURCE_FILES} ${APPLICATION_HEADERS})
-+
-+ ENDIF(APPLICATION_COMMAND_LINE)
-+
-+
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_OUTPUT_NAME "${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}")
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELEASE_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELEASE_POSTFIX}")
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}")
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}")
-+ if(APPLE)
-+ IF(BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES
-+ BUILD_WITH_INSTALL_RPATH ON )
-+
-+ ENDIF(BUILD_OSSIM_FRAMEWORKS)
-+ ENDIF(APPLE)
-+
-+ IF(MSVC_IDE AND OSSIM_MSVC_VERSIONED_DLL)
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")
-+ ENDIF(MSVC_IDE AND OSSIM_MSVC_VERSIONED_DLL)
-+
-+
-+ SETUP_LINK_LIBRARIES()
-+
-+ IF(APPLICATION_INSTALL)
-+ IF(APPLE)
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} BUNDLE DESTINATION ${INSTALL_RUNTIME_DIR} COMPONENT ${APPLICATION_COMPONENT_NAME})
-+ ELSE(APPLE)
-+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} ${INSTALL_COMPONENT_INFO} COMPONENT ${APPLICATION_COMPONENT_NAME})
-+ ENDIF(APPLE)
-+ ENDIF(APPLICATION_INSTALL)
-+
-+ SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES
-+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BUILD_RUNTIME_DIR}")
-+
-+
-+ENDMACRO(OSSIM_SETUP_APPLICATION)
-+
-+#####################################################################################################
-+# MACRO: OSSIM_LINK_LIBRARY
-+#
-+# Example:
-+# OSSIM_LINK_LIBRARY(ossim
-+# COMPONENT_NAME ossim
-+# SOURCE_FILES foo.cpp
-+# HEADERS foo.h
-+# TYPE SHARED
-+# LIBRARIES <list of libraries to link against>
-+# INSTALL_LIB
-+# INSTALL_HEADERS)
-+#
-+# The INSTALL_LIB says to add a default install command for the library by default it will setup the following
-+# install(TARGETS ossim
-+# FRAMEWORK DESTINATION ${INSTALL_FRAMEWORK_DIR}
-+# RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
-+# LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
-+# ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
-+# PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}
-+# COMPONENT ossim)
-+#
-+# The INSTALL_HEADERS will do a default header installation if the option is passed in
-+# install(FILES <list of headers> DESTINATION "include/ossim" COMPONENT ossim)
-+#####################################################################################################
-+MACRO(OSSIM_LINK_LIBRARY)
-+ # The SO_VERSION and VERSION are here for override purpose only so other libraries with their own
-+ # versioning scheme can use the sum linking
-+ #
-+ OSSIM_PARSE_ARGUMENTS(LINK
-+ "COMPONENT_NAME;SOURCE_FILES;HEADERS;TYPE;LIBRARIES;ADDITIONAL_COMPILE_FLAGS;SOVERSION;VERSION;PUBLIC_HEADERS"
-+ "INSTALL_LIB;INSTALL_HEADERS;VERSION_SYMLINKS"
-+ ${ARGN})
-+ OSSIM_CAR(LINK_NAME "${LINK_DEFAULT_ARGS}")
-+ OSSIM_CDR(LINK_SOURCES "${LINK_DEFAULT_ARGS}")
-+ ADD_DEFINITIONS("${OSSIM_COMMON_COMPILER_FLAGS}")
-+ ADD_LIBRARY(${LINK_NAME}
-+ ${LINK_TYPE}
-+ ${LINK_HEADERS}
-+ ${LINK_SOURCE_FILES})
-+ IF(NOT LINK_PUBLIC_HEADERS)
-+ SET(LINK_PUBLIC_HEADERS ${LINK_HEADERS})
-+ ENDIF()
-+ IF(LINK_ADDITIONAL_COMPILE_FLAGS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ COMPILE_FLAGS ${LINK_ADDITIONAL_COMPILE_FLAGS})
-+ ENDIF(LINK_ADDITIONAL_COMPILE_FLAGS)
-+ if(APPLE)
-+ IF(BUILD_SHARED_LIBS)
-+# SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+# SET(CMAKE_INSTALL_RPATH "${OSSIM_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}")
-+ IF(BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ FRAMEWORK TRUE
-+ BUILD_WITH_INSTALL_RPATH ON
-+ INSTALL_NAME_DIR @rpath/Frameworks)
-+ ELSE(BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ FRAMEWORK FALSE
-+ BUILD_WITH_INSTALL_RPATH ON
-+ INSTALL_NAME_DIR @rpath/lib)
-+ ENDIF(BUILD_OSSIM_FRAMEWORKS)
-+ ELSE(BUILD_SHARED_LIBRARY)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ FRAMEWORK FALSE)
-+ ENDIF(BUILD_SHARED_LIBS)
-+ ENDIF(APPLE)
-+ IF(UNIX AND BUILD_SHARED_LIBS AND NOT APPLE)
-+ IF(LINK_VERSION_SYMLINKS)
-+ IF(NOT LINK_SOVERSION)
-+ set(LINK_SOVERSION "${OSSIM_SOVERSION}")
-+ ENDIF(NOT LINK_SOVERSION)
-+ IF(NOT LINK_VERSION)
-+ set(LINK_VERSION "${OSSIM_VERSION}")
-+ ENDIF(NOT LINK_VERSION)
-+ # ADD_CUSTOM_TARGET( lib DEPENDS ${LINK_NAME} )
-+ # change lib_target properties
-+ SET_TARGET_PROPERTIES( ${LINK_NAME} PROPERTIES
-+ # create *nix style library versions + symbolic links
-+ VERSION ${LINK_VERSION}
-+ SOVERSION ${LINK_SOVERSION}
-+ # allow creating static and shared libs without conflicts
-+ CLEAN_DIRECT_OUTPUT 1
-+ # avoid conflicts between library and binary target names
-+ OUTPUT_NAME ${LINK_NAME} )
-+ ENDIF(LINK_VERSION_SYMLINKS)
-+ ENDIF(UNIX AND BUILD_SHARED_LIBS AND NOT APPLE)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BUILD_RUNTIME_DIR}")
-+ IF(APPLE AND BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BUILD_FRAMEWORK_DIR}")
-+ ELSE(APPLE AND BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BUILD_LIBRARY_DIR}")
-+ ENDIF(APPLE AND BUILD_OSSIM_FRAMEWORKS)
-+ SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES
-+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BUILD_LIBRARY_DIR}")
-+
-+ TARGET_LINK_LIBRARIES(${LINK_NAME} ${LINK_LIBRARIES} ${${LINK_NAME}_EXTRA_LIBS})
-+
-+ IF(LINK_INSTALL_LIB)
-+ IF(LINK_INSTALL_HEADERS)
-+ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PUBLIC_HEADER "${LINK_PUBLIC_HEADERS}")
-+ install(TARGETS ${LINK_NAME}
-+ FRAMEWORK DESTINATION ${INSTALL_FRAMEWORK_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR} COMPONENT ${LINK_COMPONENT_NAME}-dev
-+ PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT ${LINK_COMPONENT_NAME}-dev)
-+ ELSE(LINK_INSTALL_HEADERS)
-+ install(TARGETS ${LINK_NAME}
-+ FRAMEWORK DESTINATION ${INSTALL_FRAMEWORK_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} COMPONENT ${LINK_COMPONENT_NAME}
-+ ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR} COMPONENT ${LINK_COMPONENT_NAME}-dev)
-+ ENDIF(LINK_INSTALL_HEADERS)
-+ ENDIF(LINK_INSTALL_LIB)
-+ENDMACRO(OSSIM_LINK_LIBRARY)
-+
-+MACRO(OSSIM_ADD_COMMON_MAKE_UNINSTALL)
-+# get_target_property(TEST_UNINSTALL uninstall CREATED)
-+# IF(NOT TEST_UNINSTALL)
-+ #-----------------------------------------------------------------------------
-+ ### uninstall target
-+ #-----------------------------------------------------------------------------
-+ SET(OSSIM_CMAKE_UNINSTALL_CONFIG "${PROJECT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in")
-+ IF(EXISTS ${OSSIM_CMAKE_UNINSTALL_CONFIG})
-+ CONFIGURE_FILE(
-+ "${OSSIM_CMAKE_UNINSTALL_CONFIG}"
-+ "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
-+ IMMEDIATE @ONLY)
-+ ADD_CUSTOM_TARGET(uninstall
-+ "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
-+ )
-+ set_target_properties(uninstall PROPERTIES CREATED 1)
-+ ENDIF(EXISTS ${OSSIM_CMAKE_UNINSTALL_CONFIG})
-+# ENDIF(NOT TEST_UNINSTALL)
-+ENDMACRO(OSSIM_ADD_COMMON_MAKE_UNINSTALL)
-+
---- /dev/null
-+++ b/ossim/CMakeModules/OssimVersion.cmake
-@@ -0,0 +1,6 @@
-+SET(OSSIM_MAJOR_VERSION_NUMBER "1")
-+SET(OSSIM_MINOR_VERSION_NUMBER "8")
-+SET(OSSIM_PATCH_VERSION_NUMBER "20")
-+SET(OSSIM_RELEASE_NUMBER "1")
-+SET(OSSIM_VERSION "${OSSIM_MAJOR_VERSION_NUMBER}.${OSSIM_MINOR_VERSION_NUMBER}.${OSSIM_PATCH_VERSION_NUMBER}" )
-+SET(OSSIM_SOVERSION "${OSSIM_MAJOR_VERSION_NUMBER}" )
---- /dev/null
-+++ b/ossim/CMakeModules/Qt5Macros.cmake
-@@ -0,0 +1,83 @@
-+# This file is included by FindQt5.cmake, don't include it directly.
-+
-+# Copyright (C) 2001-2009 Kitware, Inc.
-+# Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
-+# Copyright (C) 2011 Nokia Corporation
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+macro (QT5_EXTRACT_OPTIONS _qt5_files _qt5_options)
-+ set(${_qt5_files})
-+ set(${_qt5_options})
-+ set(_QT5_DOING_OPTIONS FALSE)
-+ foreach(_currentArg ${ARGN})
-+ if ("${_currentArg}" STREQUAL "OPTIONS")
-+ set(_QT5_DOING_OPTIONS TRUE)
-+ else ()
-+ if(_QT5_DOING_OPTIONS)
-+ list(APPEND ${_qt5_options} "${_currentArg}")
-+ else()
-+ list(APPEND ${_qt5_files} "${_currentArg}")
-+ endif()
-+ endif ()
-+ endforeach()
-+endmacro ()
-+
-+
-+MACRO (QT5_GET_MOC_FLAGS _moc_flags)
-+ SET(${_moc_flags})
-+ GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
-+
-+ FOREACH(_current ${_inc_DIRS})
-+ IF("${_current}" MATCHES "\\.framework/?$")
-+ STRING(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
-+ SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
-+ ELSE("${_current}" MATCHES "\\.framework/?$")
-+ SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
-+ ENDIF("${_current}" MATCHES "\\.framework/?$")
-+ ENDFOREACH(_current ${_inc_DIRS})
-+
-+ GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
-+ FOREACH(_current ${_defines})
-+ SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
-+ ENDFOREACH(_current ${_defines})
-+
-+ IF(Q_WS_WIN)
-+ SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
-+ ENDIF(Q_WS_WIN)
-+
-+ENDMACRO (QT5_GET_MOC_FLAGS)
-+
-+# helper macro to set up a moc rule
-+MACRO (QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-+ # For Windows, create a parameters file to work around command line length limit
-+ IF (WIN32)
-+ # Pass the parameters in a file. Set the working directory to
-+ # be that containing the parameters file and reference it by
-+ # just the file name. This is necessary because the moc tool on
-+ # MinGW builds does not seem to handle spaces in the path to the
-+ # file given with the @ syntax.
-+ GET_FILENAME_COMPONENT(_moc_outfile_name "${outfile}" NAME)
-+ GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
-+ IF(_moc_outfile_dir)
-+ SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
-+ ENDIF(_moc_outfile_dir)
-+ SET (_moc_parameters_file ${outfile}_parameters)
-+ SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-+ STRING (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
-+ FILE (WRITE ${_moc_parameters_file} "${_moc_parameters}")
-+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-+ COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
-+ DEPENDS ${infile}
-+ ${_moc_working_dir}
-+ VERBATIM)
-+ ELSE (WIN32)
-+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-+ COMMAND ${QT_MOC_EXECUTABLE}
-+ ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
-+ DEPENDS ${infile})
-+ ENDIF (WIN32)
-+ENDMACRO (QT5_CREATE_MOC_COMMAND)
-+
-+
---- /dev/null
-+++ b/ossim/CMakeModules/cmake_uninstall.cmake.in
-@@ -0,0 +1,22 @@
-+IF(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_BINARY_DIR@/install_manifest.txt\"")
-+ENDIF()
-+
-+FILE(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-+STRING(REGEX REPLACE "\n" ";" files "${files}")
-+
-+FOREACH(file ${files})
-+ MESSAGE(STATUS "Uninstalling \"${file}\"")
-+ IF(EXISTS "${file}")
-+ EXEC_PROGRAM(
-+ "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-+ OUTPUT_VARIABLE rm_out
-+ RETURN_VALUE rm_retval
-+ )
-+ IF(NOT "${rm_retval}" STREQUAL 0)
-+ MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-+ ENDIF()
-+ ELSE()
-+ MESSAGE(STATUS "File \"${file}\" does not exist.")
-+ ENDIF()
-+ENDFOREACH()
diff --git a/debian/patches/developed-typo.patch b/debian/patches/developed-typo.patch
deleted file mode 100644
index fe327ae..0000000
--- a/debian/patches/developed-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix 'developped' typo, replace with 'developed'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/src/ossim/base/ossimTieGpt.cpp
-+++ b/ossim/src/ossim/base/ossimTieGpt.cpp
-@@ -195,7 +195,7 @@ ossimTieGpt::importFromGmlNode(ossimRefP
- else {
- //try to read coordinates
- //TBD
-- ossimNotify(ossimNotifyLevel_WARN) << "WARNING: ossimTieGpt::importFromGmlNode gml:coordinates not developped yet for ground\n";
-+ ossimNotify(ossimNotifyLevel_WARN) << "WARNING: ossimTieGpt::importFromGmlNode gml:coordinates not developed yet for ground\n";
- return false;
- }
-
-@@ -226,7 +226,7 @@ ossimTieGpt::importFromGmlNode(ossimRefP
- else {
- //try to read coordinates
- //TBD
-- ossimNotify(ossimNotifyLevel_WARN) << "WARNING: ossimTieGpt::importFromGmlNode gml:coordinates not developped yet for image\n";
-+ ossimNotify(ossimNotifyLevel_WARN) << "WARNING: ossimTieGpt::importFromGmlNode gml:coordinates not developed yet for image\n";
- return false;
- }
-
diff --git a/debian/patches/extension-typo.patch b/debian/patches/extension-typo.patch
deleted file mode 100644
index e68ca1f..0000000
--- a/debian/patches/extension-typo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix 'extention' typo, replace with 'extension'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/include/ossim/imaging/ossimImageFileWriter.h
-+++ b/ossim/include/ossim/imaging/ossimImageFileWriter.h
-@@ -179,7 +179,7 @@ public:
- * Will write a world file. The extension will be derived from the
- * image extension.
- *
-- * Currently handles the following image extentions:
-+ * Currently handles the following image extensions:
- *
- * "tif" or "tiff" -> "tfw"
- * "jpg" of "jpeg" -> "jpw"
---- a/ossim/include/ossim/util/ossimChipperUtil.h
-+++ b/ossim/include/ossim/util/ossimChipperUtil.h
-@@ -421,7 +421,7 @@ private:
- * @brief Creates a new writer.
- *
- * This will use the writer option (-w or --writer), if present; else,
-- * it will be derived from the output file extention.
-+ * it will be derived from the output file extension.
- *
- * This will also set any writer properties passed in.
- *
---- a/ossim/src/ossim/util/ossimImageUtil.cpp
-+++ b/ossim/src/ossim/util/ossimImageUtil.cpp
-@@ -1445,7 +1445,7 @@ void ossimImageUtil::usage(ossimArgument
-
- << "\n\nExpanded command option variables:\n\n"
- << "%{basename} = filename without path\n"
-- << "%{basename_no_ext} = filename without path and without extention\n"
-+ << "%{basename_no_ext} = filename without path and without extension\n"
- << "%{date} = Expanded to current zulu time. Default format=yyyymmdd\n"
- << " output format controlled by command0.strf_time_format key.\n"
- << "%{dirname} = path of filename\n"
diff --git a/debian/patches/fix-ossim-trac-2354.diff b/debian/patches/fix-ossim-trac-2354.diff
deleted file mode 100644
index b24dd82..0000000
--- a/debian/patches/fix-ossim-trac-2354.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix build failure with GCC 6: no match for 'operator<<'.
-Author: Rashad M <rashadkm at gmail.com>
-Origin: https://trac.osgeo.org/ossim/attachment/ticket/2354/fix-ossim-trac-2354.diff
-Bug-Debian: https://bugs.debian.org/811851
-Bug: https://trac.osgeo.org/ossim/ticket/2354
-
---- a/ossim/src/ossim/elevation/ossimElevManager.cpp
-+++ b/ossim/src/ossim/elevation/ossimElevManager.cpp
-@@ -643,14 +643,26 @@ std::ostream& ossimElevManager::print(os
- << "\nm_useGeoidIfNullFlag = "<<m_useGeoidIfNullFlag
- << "\nm_currentDatabaseIdx = "<<m_currentDatabaseIdx
- << "\nm_dbRoundRobin.size = "<<m_dbRoundRobin.size();
-+
- for (ossim_uint32 i=0; i<m_dbRoundRobin.size(); ++i)
- {
- out<<"\nm_dbRoundRobin["<<i<<"].size = "<<m_dbRoundRobin[i].size()<<endl;
- for (ossim_uint32 j=0; j<m_dbRoundRobin[i].size(); ++j)
-- out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = "<<m_dbRoundRobin[i][j]->print(out)<<endl;
-+ {
-+ out<<"m_dbRoundRobin["<<i<<"]["<<j<<"] = ";
-+ // GP: We have to separate this line. On MS it will not compile
-+ // otherwise
-+ m_dbRoundRobin[i][j]->print(out);
-+
-+ }
-+ out<<endl;
- }
-- cout<<"\n"<<ossimElevSource::print(cout);
-+ out<<"\n";
-+ ossimElevSource::print(out);
- return out;
-+
-+
-+
- }
-
-
---- a/ossim/src/ossim/elevation/ossimElevSource.cpp
-+++ b/ossim/src/ossim/elevation/ossimElevSource.cpp
-@@ -269,8 +269,9 @@ std::ostream& ossimElevSource::print(std
- << "\ntheMaxHeightAboveMSL = "<<theMaxHeightAboveMSL
- << "\ntheNullHeightValue = "<<theNullHeightValue
- << "\ntheSeaLevelValue = "<<theSeaLevelValue
-- << "\ntheGroundRect = "<<theGroundRect
-- << ossimSource::print(out);
-+ << "\ntheGroundRect = "<<theGroundRect;
-+ // GP: need this by itself. MS errors out
-+ ossimSource::print(out);
- return out;
- }
-
diff --git a/debian/patches/message-typo.patch b/debian/patches/message-typo.patch
deleted file mode 100644
index 079e3e3..0000000
--- a/debian/patches/message-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'messsage' typo, replace with 'message'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/src/ossim/support_data/ossimNmeaMessage.cpp
-+++ b/ossim/src/ossim/support_data/ossimNmeaMessage.cpp
-@@ -64,7 +64,7 @@ void ossimNmeaMessage::parseMessage(std:
- m_message = "";
- if(!isValidStartChar(static_cast<char>(in.peek())))
- {
-- throw ossimException(ossimString("Starting NMEA messsage indicator not found, expected one of ") +
-+ throw ossimException(ossimString("Starting NMEA message indicator not found, expected one of ") +
- m_startChars + " but found " +
- ossimString((char)in.peek()));
- }
diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch
deleted file mode 100644
index 25610ab..0000000
--- a/debian/patches/output-typo.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Description: Fix 'ouput' typo, replace with 'output'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/include/ossim/base/ossimImageTypeLut.h
-+++ b/ossim/include/ossim/base/ossimImageTypeLut.h
-@@ -7,7 +7,7 @@
- // Description:
- //
- // Contains class declaration for ImageTypeLut. Currently has mapping of
--// ouput image writes from enumeration to string and string to
-+// output image writes from enumeration to string and string to
- // enumeration.
- //
- //*******************************************************************
---- a/ossim/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp
-+++ b/ossim/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp
-@@ -34,7 +34,7 @@ static void usage()
- ossimNotify(ossimNotifyLevel_INFO)
- << "\nNOTES:"
- << "\n- Output is to a \".omd\" file so if the image was"
-- << " \"N27W081.hgt\" ouput will be a \"N27W081.omd\" file."
-+ << " \"N27W081.hgt\" output will be a \"N27W081.omd\" file."
- << "\n- Example: computeSrtmStats *.hgt"
- << endl;
- }
---- a/ossim/src/apps/ossim-mosaic/ossim-mosaic.cpp
-+++ b/ossim/src/apps/ossim-mosaic/ossim-mosaic.cpp
-@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
- argumentParser.getApplicationUsage()->addCommandLineOption("-m", "Mosiac type (SIMPLE, BLEND, FEATHER, or any MosaicCombinerType [ossimClosestToCenter, ossimFeatherMosaic, etc..]) (default=SIMPLE");
- argumentParser.getApplicationUsage()->addCommandLineOption("-w", "Writer type (tiff_strip, jpeg, etc... see ossim-info --writers) (default=tiff_strip)");
- argumentParser.getApplicationUsage()->addCommandLineOption("--writer-prop <string>", "Adds a property to send to the writer. format is name=value");
-- argumentParser.getApplicationUsage()->addCommandLineOption("-t", "ouput a keyword list template");
-+ argumentParser.getApplicationUsage()->addCommandLineOption("-t", "output a keyword list template");
-
- // Allocate some stuff up front for use later
- ossimKeywordlist kwl;
-@@ -410,7 +410,7 @@ int main(int argc, char *argv[])
- {
- ossimNotify(ossimNotifyLevel_WARN)
- << "mosaic ERROR:"
-- << "\nOuput file " << outfile << " exits and will not be overwritten!"
-+ << "\nOutput file " << outfile << " exits and will not be overwritten!"
- << "\nExiting..."
- << std::endl;
- exit(1);
---- a/ossim/src/ossim/base/ossimImageTypeLut.cpp
-+++ b/ossim/src/ossim/base/ossimImageTypeLut.cpp
-@@ -7,7 +7,7 @@
- // Description:
- //
- // Contains class definition for ImageTypeLUT. Currently has mapping of
--// ouput image writes from enumeration to string and string to
-+// output image writes from enumeration to string and string to
- // enumeration.
- //
- //*******************************************************************
---- a/ossim/src/ossim/projection/ossimRpcProjection.cpp
-+++ b/ossim/src/ossim/projection/ossimRpcProjection.cpp
-@@ -1062,7 +1062,7 @@ ossimRpcProjection::optimizeFit(const os
- //note : please limit the number of tie points
- //
- //INPUTS: requires Jacobian matrix (partial derivatives with regards to parameters)
-- //OUPUTS: will also compute parameter covariance matrix
-+ //OUTPUTS: will also compute parameter covariance matrix
- //
- //TBD: use targetVariance!
-
---- a/ossim/src/ossim/projection/ossimSensorModel.cpp
-+++ b/ossim/src/ossim/projection/ossimSensorModel.cpp
-@@ -1404,7 +1404,7 @@ ossimSensorModel::optimizeFit(const ossi
- //note : please limit the number of tie points
- //
- //INPUTS: requires Jacobian matrix (partial derivatives with regards to parameters)
-- //OUPUTS: will also compute parameter covariance matrix
-+ //OUTPUTS: will also compute parameter covariance matrix
- //
- //TBD: use targetVariance!
-
---- a/ossim/src/ossim/support_data/ossimFfRevb.cpp
-+++ b/ossim/src/ossim/support_data/ossimFfRevb.cpp
-@@ -564,7 +564,7 @@ void ossimFfRevb::write(ostream& os) con
- << RADIANCE_DESC;
-
- int i;
-- for (i=0; i<NUMBER_OF_BANDS-1; i++) // Ouput six of the seven bands.
-+ for (i=0; i<NUMBER_OF_BANDS-1; i++) // Output six of the seven bands.
- {
- os << setw(RADIANCE_SIZE) << theBandRadiance[i] << SPACE;
- }
---- a/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp
-+++ b/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp
-@@ -445,7 +445,7 @@ void ossimNitfImageHeaderV2_1::writeStre
- out.write(theUserDefinedOverflow, 3);
- }
-
-- // need to ouput tagged data
-+ // need to output tagged data
- // here
- //
- ossim_uint32 totalLength = getTotalTagLength();
---- a/ossim/include/ossim/base/ossimFilename.h
-+++ b/ossim/include/ossim/base/ossimFilename.h
-@@ -218,7 +218,7 @@ public:
- *
- * @return True on success, false on error.
- */
-- bool copyFileTo(const ossimFilename& ouputFile) const;
-+ bool copyFileTo(const ossimFilename& outputFile) const;
-
- /**
- * @brief Checks whether file name is relative or absolute.
---- a/ossim/src/ossim/util/ossimChipperUtil.cpp
-+++ b/ossim/src/ossim/util/ossimChipperUtil.cpp
-@@ -4210,7 +4210,7 @@ void ossimChipperUtil::getAreaOfInterest
- rect = source->getBoundingRect(0);
- }
-
-- } // if ( m_getOuputGeometry.valid() )
-+ } // if ( m_getOutputGeometry.valid() )
- else
- {
- // Should never happer...
---- a/ossim/src/ossim/util/ossimEquationUtil.cpp
-+++ b/ossim/src/ossim/util/ossimEquationUtil.cpp
-@@ -170,7 +170,7 @@ ossimEquationUtil::ossimEquationUtil(oss
- m_usage.addCommandLineOption("-k <filename>", "keyword list to load from");
- m_usage.addCommandLineOption("-w <type>", "Writer type (tiff_strip, jpeg, etc... see ossim-info --writers) (default=tiff_strip)");
- m_usage.addCommandLineOption("--writer-prop <string>", "Adds a property to send to the writer. format is name=value");
-- m_usage.addCommandLineOption("-t <filename>", "ouput a keyword list template");
-+ m_usage.addCommandLineOption("-t <filename>", "output a keyword list template");
- }
-
- bool ossimEquationUtil::execute()
diff --git a/debian/patches/requested-typo.patch b/debian/patches/requested-typo.patch
deleted file mode 100644
index b2e6a21..0000000
--- a/debian/patches/requested-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'requsted' typo, replace with 'requested'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/29
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/a8d926211493eecc72596a313224af047a1ae19e
-
---- a/ossim/src/ossim/point_cloud/ossimPointCloudImageHandler.cpp
-+++ b/ossim/src/ossim/point_cloud/ossimPointCloudImageHandler.cpp
-@@ -252,7 +252,7 @@ bool ossimPointCloudImageHandler::getTil
- // This should never happen;
- ossimNotify(ossimNotifyLevel_FATAL)
- << "ossimPointCloudImageHandler::getTile() ERROR: \n"
-- << "More bands were requsted than was available from the point cloud source. Returning "
-+ << "More bands were requested than was available from the point cloud source. Returning "
- << "blank tile." << endl;
- result->makeBlank();
- return false;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1b20f13..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake
-avoid_overwrite_build_date.patch
-developed-typo.patch
-unknown-typo.patch
-message-typo.patch
-output-typo.patch
-accommodate-typo.patch
-extension-typo.patch
-fix-ossim-trac-2354.diff
-requested-typo.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index b6166f6..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Fix spelling errors.
- * Ammount -> Amount
- * Defualt -> Default
- * repaced -> replaced
- * availabe -> available
- * returing -> returning
- * initilizing -> initializing
- * direcories -> directories
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/ossim/ticket/2383
-
---- a/ossim/src/apps/ossim-pixelflip/ossim-pixelflip.cpp
-+++ b/ossim/src/apps/ossim-pixelflip/ossim-pixelflip.cpp
-@@ -377,7 +377,7 @@ void usage()
- << "\nThis is a good Landsat7 edge fixer..."
- << "\n"
- << "\nIf mode is \"replace_full_targets\":"
-- << "\nTarget will be repaced only if all subpixels(bands) have the "
-+ << "\nTarget will be replaced only if all subpixels(bands) have the "
- << "target."
- << "\n"
- << "\n Example:"
---- a/ossim/src/ossim/util/ossimChipperUtil.cpp
-+++ b/ossim/src/ossim/util/ossimChipperUtil.cpp
-@@ -201,7 +201,7 @@ void ossimChipperUtil::addArguments(ossi
-
- au->addCommandLineOption("--central-meridian","<central_meridian_in_decimal_degrees>\nNote if set this will be used for the central meridian of the projection. This can be used to lock the utm zone.");
-
-- au->addCommandLineOption("--color","<r> <g> <b>\nhillshade option - Set the red, green and blue color values to be used with hillshade.\nThis option can be used with or without an image source for color.\nRange 0 to 255, Defualt r=255, g=255, b=255");
-+ au->addCommandLineOption("--color","<r> <g> <b>\nhillshade option - Set the red, green and blue color values to be used with hillshade.\nThis option can be used with or without an image source for color.\nRange 0 to 255, Default r=255, g=255, b=255");
-
- au->addCommandLineOption("--color-table","<color-table.kwl>\nhillshade or color-relief option - Keyword list containing color table for color-relief option.");
-
---- a/ossim/src/ossim/imaging/ossimGeneralRasterInfo.cpp
-+++ b/ossim/src/ossim/imaging/ossimGeneralRasterInfo.cpp
-@@ -72,7 +72,7 @@ SET_NULLS("set_fill_to_nulls_mode",
-
- static const ossimKeyword
- PIXELS_TO_CHOP("pixels_to_chop",
-- "Ammount of pixels to chop from edge.");
-+ "Amount of pixels to chop from edge.");
-
- static const ossimInterleaveTypeLut INTERLEAVE_TYPE_LUT;
-
---- a/ossim/src/ossim/imaging/ossimCcfTileSource.cpp
-+++ b/ossim/src/ossim/imaging/ossimCcfTileSource.cpp
-@@ -607,7 +607,7 @@ bool ossimCcfTileSource::setOutputBandLi
- << "\nOutput band number in list is greater than the "
- << "number of bands in the image source!"
- << "\noutputBandList[" << i << "]: "
-- << "\nHighest availabe band: "
-+ << "\nHighest available band: "
- << (getNumberOfInputBands() - 1)
- << "\nError status has been set! Returning..."
- << endl;
---- a/ossim/src/ossim/imaging/ossimImageChain.cpp
-+++ b/ossim/src/ossim/imaging/ossimImageChain.cpp
-@@ -1505,7 +1505,7 @@ void ossimImageChain::initialize()
- {
- if(traceDebug())
- {
-- CLOG << "initilizing source: "
-+ CLOG << "initializing source: "
- << imageChainList()[index]->getClassName()
- << std::endl;
- }
---- a/ossim/src/ossim/imaging/ossimImageSourceSequencer.cpp
-+++ b/ossim/src/ossim/imaging/ossimImageSourceSequencer.cpp
-@@ -326,7 +326,7 @@ ossimRefPtr<ossimImageData> ossimImageSo
- {
- if(traceDebug())
- {
-- CLOG << "No input connection so returing NULL" << endl;
-+ CLOG << "No input connection so returning NULL" << endl;
- }
- }
- if(traceDebug())
---- a/ossim/src/ossim/support_data/ossimTiffInfo.cpp
-+++ b/ossim/src/ossim/support_data/ossimTiffInfo.cpp
-@@ -318,7 +318,7 @@ std::ostream& ossimTiffInfo::print(std::
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_WARN)
-- << MODULE << " FATAL error reading number of direcories."
-+ << MODULE << " FATAL error reading number of directories."
- << std::endl;
- }
- str.close();
-@@ -743,7 +743,7 @@ std::ostream& ossimTiffInfo::print(std::
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_WARN)
-- << MODULE << " FATAL error reading number of direcories."
-+ << MODULE << " FATAL error reading number of directories."
- << std::endl;
- }
- return outStr;
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
deleted file mode 100644
index 6b2417b..0000000
--- a/debian/patches/unknown-typo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fix 'unkown' typo, replace with 'unknown'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
-
---- a/ossim/include/ossim/support_data/ossimEnviHeader.h
-+++ b/ossim/include/ossim/support_data/ossimEnviHeader.h
-@@ -363,7 +363,7 @@ public:
- * (little_endian or big_endian)
- * byte_order: little_endian
- *
-- * map_info: Unkown
-+ * map_info: Unknown
- *
- * wavelength_units:
- *
---- a/ossim/src/ossim/imaging/ossimArcInfoGridWriter.cpp
-+++ b/ossim/src/ossim/imaging/ossimArcInfoGridWriter.cpp
-@@ -269,7 +269,7 @@ bool ossimArcInfoGridWriter::writeBinary
- {
- ossimNotify(ossimNotifyLevel_WARN)
- << "ossimArcInfoGridWriter::writeBinaryAigHeader: "
-- << "unkown scalar type" << std::endl;
-+ << "unknown scalar type" << std::endl;
- }
- }
-
---- a/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp
-+++ b/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp
-@@ -891,7 +891,7 @@ void ossimOverviewSequencer::resampleTil
- }
- default:
- ossimNotify(ossimNotifyLevel_WARN)
-- << "ossimOverviewSequencer::resampleTile Unkown pixel type!"
-+ << "ossimOverviewSequencer::resampleTile Unknown pixel type!"
- << std::endl;
- return;
-
---- a/ossim/src/ossim/support_data/ossimJ2kInfo.cpp
-+++ b/ossim/src/ossim/support_data/ossimJ2kInfo.cpp
-@@ -216,7 +216,7 @@ std::ostream& ossimJ2kInfo::printUnknown
- readUInt16(segmentLength, str);
-
- std::string pfx = prefix;
-- pfx += "unkown.";
-+ pfx += "unknown.";
-
- out.setf(std::ios_base::hex, std::ios_base::basefield);
- out << pfx << "marker: 0x" << std::setfill('0') << std::setw(4)
---- a/ossim/src/ossim/imaging/ossimTiffOverviewBuilder.cpp
-+++ b/ossim/src/ossim/imaging/ossimTiffOverviewBuilder.cpp
-@@ -1258,7 +1258,7 @@ bool ossimTiffOverviewBuilder::setInputS
- setErrorStatus();
- ossimNotify(ossimNotifyLevel_WARN)
- << MODULE << " ERROR:"
-- << "\nUnknow pixel type: "
-+ << "\nUnknown pixel type: "
- << (ossimScalarTypeLut::instance()->
- getEntryString(m_imageHandler->getOutputScalarType()))
- << std::endl;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git
More information about the Pkg-grass-devel
mailing list