[ossim] 01/01: update cmakemodules patch for 1.8.20-3

Rashad Kanavath rashad-guest at moszumanska.debian.org
Thu Jan 7 10:44:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

rashad-guest pushed a commit to branch master
in repository ossim.

commit 651a75f9fd4cdf3ad60b1f45af44ed72b38dc4c8
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Date:   Thu Jan 7 09:38:27 2016 +0100

    update cmakemodules patch for 1.8.20-3
    
    update changelog
    
    do not build static lib
---
 debian/changelog            |    5 +-
 debian/libossim-dev.install |    1 -
 debian/patches/cmake        | 1682 +++----------------------------------------
 3 files changed, 122 insertions(+), 1566 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a05006..db2b752 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-ossim (1.8.20.3+ds-2) UNRELEASED; urgency=medium
+ossim (1.8.20.3+ds-1) unstable; urgency=medium
 
   * Team upload.
   * date format used is yyyymmdd in OSSIM_BUILD_DATE
   * building frameworks are for OSX
   * remove unused dependencies for ossim-core
+  * update cmake modules for 1.8.20
 
- -- Rashad Kanavath <rashad.kanavath at c-s.fr>  Wed, 30 Dec 2015 15:00:59 +0100
+ -- Rashad Kanavath <rashad.kanavath at c-s.fr>  Thu, 07 Jan 2016 09:48:20 +0100
 
 ossim (1.8.20.3+ds-1) unstable; urgency=medium
 
diff --git a/debian/libossim-dev.install b/debian/libossim-dev.install
index 781d2b1..67322c0 100644
--- a/debian/libossim-dev.install
+++ b/debian/libossim-dev.install
@@ -1,3 +1,2 @@
 usr/lib/libossim.so
-usr/lib/libossim.a
 usr/include
diff --git a/debian/patches/cmake b/debian/patches/cmake
index 4ec058c..9e7404f 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
 Forwarded: not-needed
 
 --- /dev/null
-+++ b/ossim/CMakeModules/FindCPPUNIT.cmake
++++ ossim/ossim/CMakeModules/FindCPPUNIT.cmake
 @@ -0,0 +1,43 @@
 +# - Find CPPUNIT
 +# Find the native CPPUNIT includes and library
@@ -49,227 +49,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR )
 --- /dev/null
-+++ b/ossim/CMakeModules/FindFFTW3.cmake
-@@ -0,0 +1,24 @@
-+# - Find fftw3 library
-+# Find the native fftw3 includes and library
-+# This module defines
-+#  FFTW3_INCLUDE_DIR, where to find tiff.h, etc.
-+#  FFTW3_LIBRARIES, libraries to link against to use FFTW3.
-+#  FFTW3_FOUND, If false, do not try to use FFTW3.
-+# also defined, but not for general use are
-+#  FFTW3_LIBRARY, where to find the FFTW3 library.
-+
-+FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h)
-+
-+SET(FFTW3_NAMES ${FFTW3_NAMES} fftw3 libfftw3)
-+FIND_LIBRARY(FFTW3_LIBRARY NAMES ${FFTW3_NAMES} )
-+
-+# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3  DEFAULT_MSG  FFTW3_LIBRARY  FFTW3_INCLUDE_DIR)
-+
-+IF(FFTW3_FOUND)
-+  SET( FFTW3_LIBRARIES ${FFTW3_LIBRARY} )
-+ENDIF(FFTW3_FOUND)
-+
-+MARK_AS_ADVANCED(FFTW3_INCLUDE_DIR FFTW3_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindFFmpeg.cmake
-@@ -0,0 +1,190 @@
-+# Locate ffmpeg
-+# This module defines
-+# FFMPEG_LIBRARIES
-+# FFMPEG_FOUND, if false, do not try to link to ffmpeg
-+# FFMPEG_INCLUDE_DIR, where to find the headers
-+#
-+# $FFMPEG_DIR is an environment variable that would
-+# correspond to the ./configure --prefix=$FFMPEG_DIR
-+#
-+# Created by Robert Osfield.
-+
-+
-+#In ffmpeg code, old version use "#include <header.h>" and newer use "#include <libname/header.h>"
-+#In OSG ffmpeg plugin, we use "#include <header.h>" for compatibility with old version of ffmpeg
-+
-+#We have to search the path which contain the header.h (usefull for old version)
-+#and search the path which contain the libname/header.h (usefull for new version)
-+
-+#Then we need to include ${FFMPEG_libname_INCLUDE_DIRS} (in old version case, use by ffmpeg header and osg plugin code)
-+#                                                       (in new version case, use by ffmpeg header) 
-+#and ${FFMPEG_libname_INCLUDE_DIRS/libname}             (in new version case, use by osg plugin code)
-+
-+
-+# Macro to find header and lib directories
-+# example: FFMPEG_FIND(AVFORMAT avformat avformat.h)
-+MACRO(FFMPEG_FIND varname shortname headername)
-+    # old version of ffmpeg put header in $prefix/include/[ffmpeg]
-+    # so try to find header in include directory
-+
-+    FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
-+        PATHS
-+        ${FFMPEG_ROOT}/include
-+        $ENV{FFMPEG_DIR}/include
-+        ~/Library/Frameworks
-+        /Library/Frameworks
-+        /usr/local/include
-+        /usr/include
-+        /sw/include # Fink
-+        /opt/local/include # DarwinPorts
-+        /opt/csw/include # Blastwave
-+        /opt/include
-+        /usr/freeware/include
-+        PATH_SUFFIXES ffmpeg
-+        DOC "Location of FFMPEG Headers"
-+    )
-+
-+    if( FFMPEG_${varname}_INCLUDE_DIRS-NOTFOUND )
-+       FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS ${headername}
-+          PATHS
-+          ${FFMPEG_ROOT}/include
-+          $ENV{FFMPEG_DIR}/include
-+          ~/Library/Frameworks
-+          /Library/Frameworks
-+          /usr/local/include
-+          /usr/include
-+          /sw/include # Fink
-+          /opt/local/include # DarwinPorts
-+          /opt/csw/include # Blastwave
-+          /opt/include
-+          /usr/freeware/include
-+          PATH_SUFFIXES ffmpeg
-+          DOC "Location of FFMPEG Headers"
-+       )
-+    endif ( FFMPEG_${varname}_INCLUDE_DIRS-NOTFOUND )
-+
-+    FIND_LIBRARY(FFMPEG_${varname}_LIBRARIES
-+        NAMES ${shortname}
-+        PATHS
-+        ${FFMPEG_ROOT}/lib
-+        $ENV{FFMPEG_DIR}/lib
-+        ~/Library/Frameworks
-+        /Library/Frameworks
-+        /usr/local/lib
-+        /usr/local/lib64
-+        /usr/lib
-+        /usr/lib64
-+        /sw/lib
-+        /opt/local/lib
-+        /opt/csw/lib
-+        /opt/lib
-+        /usr/freeware/lib64
-+        DOC "Location of FFMPEG Libraries"
-+    )
-+
-+    IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
-+        SET(FFMPEG_${varname}_FOUND 1)
-+    ENDIF(FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS)
-+
-+ENDMACRO(FFMPEG_FIND)
-+
-+SET(FFMPEG_ROOT "$ENV{FFMPEG_DIR}" CACHE PATH "Location of FFMPEG")
-+
-+# find stdint.h
-+IF(WIN32)
-+
-+    FIND_PATH(FFMPEG_STDINT_INCLUDE_DIR stdint.h
-+        PATHS
-+        ${FFMPEG_ROOT}/include
-+        $ENV{FFMPEG_DIR}/include
-+        ~/Library/Frameworks
-+        /Library/Frameworks
-+        /usr/local/include
-+        /usr/include
-+        /sw/include # Fink
-+        /opt/local/include # DarwinPorts
-+        /opt/csw/include # Blastwave
-+        /opt/include
-+        /usr/freeware/include
-+        PATH_SUFFIXES ffmpeg
-+        DOC "Location of FFMPEG stdint.h Header"
-+    )
-+
-+    IF (FFMPEG_STDINT_INCLUDE_DIR)
-+        SET(STDINT_OK TRUE)
-+    ENDIF()
-+
-+ELSE()
-+
-+    SET(STDINT_OK TRUE)
-+
-+ENDIF()
-+
-+FFMPEG_FIND(LIBAVFORMAT avformat avformat.h)
-+FFMPEG_FIND(LIBAVDEVICE avdevice avdevice.h)
-+FFMPEG_FIND(LIBAVCODEC  avcodec  avcodec.h)
-+FFMPEG_FIND(LIBAVUTIL   avutil   avutil.h)
-+# FFMPEG_FIND(LIBAVCORE   avcore   avcore.h)
-+FFMPEG_FIND(LIBSWSCALE  swscale  swscale.h)  
-+FFMPEG_FIND(LIBSWRESAMPLE  swresample swresample.h)  
-+FFMPEG_FIND(LIBAVFILTER avfilter avfilter.h)
-+
-+SET(FFMPEG_FOUND "NO")
-+# Note we don't check FFMPEG_LIBSWSCALE_FOUND here, it's optional.
-+IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND AND STDINT_OK)
-+
-+    SET(FFMPEG_FOUND "YES")
-+
-+    SET( FFMPEG_INCLUDE_DIRS
-+         ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
-+         ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}
-+         ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
-+         ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
-+         ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}
-+         ${FFMPEG_LIBAVFILTER_INCLUDE_DIRS}
-+         ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} )
-+
-+    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
-+
-+    # Note we don't add FFMPEG_LIBSWSCALE_LIBRARIES here, it will be added if found later.
-+    SET(FFMPEG_LIBRARIES
-+        ${FFMPEG_LIBAVCODEC_LIBRARIES}
-+        ${FFMPEG_LIBAVFORMAT_LIBRARIES}
-+        ${FFMPEG_LIBAVDEVICE_LIBRARIES}
-+        ${FFMPEG_LIBAVUTIL_LIBRARIES}
-+        ${FFMPEG_LIBSWSCALE_LIBRARIES})
-+        
-+    IF(FFMPEG_LIBAVFILTER_LIBRARIES)
-+      SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBAVFILTER_LIBRARIES})
-+    ENDIF()
-+    IF(FFMPEG_LIBSWRESAMPLE_LIBRARIES)
-+      SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES})
-+    ENDIF()
-+
-+    IF (FFMPEG_LIBAVCORE_FOUND)
-+        SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBAVCORE_LIBRARIES} )
-+        SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS}
-+              ${FFMPEG_LIBAVCORE_INCLUDE_DIRS} ${FFMPEG_LIBAVCORE_INCLUDE_DIRS}/libavformat
-+           )
-+    ENDIF()
-+   
-+#---
-+# This function sets FFMPEG_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( FFMPEG DEFAULT_MSG 
-+                                   FFMPEG_LIBRARIES
-+                                   FFMPEG_INCLUDE_DIRS )
-+
-+
-+#  use aPPEND instead of set.  Seems to work better
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
-+
-+ELSE ()
-+   MESSAGE(STATUS "Could not find FFMPEG")
-+ENDIF()
-+
-+if( NOT FFMPEG_FIND_QUIETLY )
-+   message( STATUS "FFMPEG_INCLUDE_DIRS = ${FFMPEG_INCLUDE_DIRS}" )
-+   message( STATUS "FFMPEG_LIBRARIES = ${FFMPEG_LIBRARIES}" )
-+endif( NOT FFMPEG_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindFreetype.cmake
++++ ossim/ossim/CMakeModules/FindFreetype.cmake
 @@ -0,0 +1,95 @@
 +# - Locate FreeType library
 +# This module defines
@@ -367,8 +147,8 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindGEOS.cmake
-@@ -0,0 +1,77 @@
++++ ossim/ossim/CMakeModules/FindGEOS.cmake
+@@ -0,0 +1,84 @@
 +#---
 +# File: FindGEOS.cmake
 +#
@@ -389,31 +169,38 @@ Forwarded: not-needed
 +# NOTE: 
 +# This script is specialized for ossim, e.g. looking in /usr/local/ossim.
 +#
-+# $Id: FindGEOS.cmake 21190 2012-06-29 19:54:24Z dburken $
++# $Id: FindGEOS.cmake 23086 2015-01-20 16:20:12Z rashadkm $
 +#---
 +
 +#---
 +# Find include path:
-+# Note: Version < 3.3.0 do not have geos.h in the geos sub directory; hence,
-+# the check for both "geos/geos.h" and "geos.h".
++# 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/geos.h geos.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 
++              PATHS
++              ${CMAKE_INSTALL_PREFIX}/lib
++              ${GEOS_DIR}/lib
 +              /usr/lib64 
-+              /usr/lib 
++              /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
@@ -447,8 +234,8 @@ Forwarded: not-needed
 +   message( STATUS "GEOS_LIBRARY=${GEOS_LIBRARY}" )
 +endif( NOT GEOS_FIND_QUIETLY )
 --- /dev/null
-+++ b/ossim/CMakeModules/FindGEOTIFF.cmake
-@@ -0,0 +1,24 @@
++++ ossim/ossim/CMakeModules/FindGEOTIFF.cmake
+@@ -0,0 +1,36 @@
 +# - Find geotiff library
 +# Find the native geotiff includes and library
 +# This module defines
@@ -458,10 +245,22 @@ Forwarded: not-needed
 +# also defined, but not for general use are
 +#  GEOTIFF_LIBRARY, where to find the GEOTIFF library.
 +
-+FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h PATHS /usr/include/geotiff /usr/include/libgeotiff /usr/local/include/libgeotiff /usr/local/include/geotiff)
++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} )
++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
@@ -474,35 +273,8 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIR GEOTIFF_LIBRARY)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindGPSTK.cmake
-@@ -0,0 +1,24 @@
-+# - Find gpstk library
-+# Find the native gpstk includes and library
-+# This module defines
-+#  GPSTK_INCLUDE_DIR, where to find tiff.h, etc.
-+#  GPSTK_LIBRARIES, libraries to link against to use GPSTK.
-+#  GPSTK_FOUND, If false, do not try to use GPSTK.
-+# also defined, but not for general use are
-+#  GPSTK_LIBRARY, where to find the GPSTK library.
-+
-+FIND_PATH(GPSTK_INCLUDE_DIR gpstk/Matrix.hpp)
-+
-+SET(GPSTK_NAMES ${GPSTK_NAMES} gpstk libgpstk)
-+FIND_LIBRARY(GPSTK_LIBRARY NAMES ${GPSTK_NAMES} )
-+
-+# handle the QUIETLY and REQUIRED arguments and set GPSTK_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPSTK  DEFAULT_MSG  GPSTK_LIBRARY  GPSTK_INCLUDE_DIR)
-+
-+IF(GPSTK_FOUND)
-+  SET( GPSTK_LIBRARIES ${GPSTK_LIBRARY} )
-+ENDIF(GPSTK_FOUND)
-+
-+MARK_AS_ADVANCED(GPSTK_INCLUDE_DIR GPSTK_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindJPEG.cmake
-@@ -0,0 +1,47 @@
++++ ossim/ossim/CMakeModules/FindJPEG.cmake
+@@ -0,0 +1,55 @@
 +# - Find JPEG
 +# Find the native JPEG includes and library
 +# This module defines
@@ -525,16 +297,24 @@ Forwarded: not-needed
 +# (To distributed this file outside of CMake, substitute the full
 +#  License text for the above reference.)
 +
-+FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h)
++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 /usr/lib /usr/lib/x86_64-linux-gnu)
-+
-+# handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if 
++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)
@@ -551,234 +331,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR )
 --- /dev/null
-+++ b/ossim/CMakeModules/FindLASzip.cmake
-@@ -0,0 +1,118 @@
-+###############################################################################
-+#
-+# CMake module to search for LASzip library
-+#
-+# On success, the macro sets the following variables:
-+# LASZIP_FOUND       = if the library found
-+# LASZIP_INCLUDE_DIR = where to find the library headers also defined,
-+#                       but not for general use are
-+# LASZIP_LIBRARY     = where to find the laszip library.
-+# LASZIP_VERSION     = version of library which was found, e.g. "1.2.5"
-+#
-+# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
-+#
-+# Module source: http://github.com/mloskot/workshop/tree/master/cmake/
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+#
-+###############################################################################
-+MESSAGE(STATUS "Searching for LASzip ${LASzip_FIND_VERSION}+ library")
-+
-+IF(LASZIP_INCLUDE_DIR)
-+  # Already in cache, be silent
-+  SET(LASZIP_FIND_QUIETLY TRUE)
-+ENDIF()
-+
-+IF(WIN32)
-+  SET(OSGEO4W_IMPORT_LIBRARY laszip)
-+  IF(DEFINED ENV{OSGEO4W_ROOT})
-+    SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
-+    #MESSAGE(STATUS " FindLASzip: trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
-+  ELSE()
-+    SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
-+    #MESSAGE(STATUS " FindLASzip: trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
-+  ENDIF()
-+ENDIF()
-+
-+
-+FIND_PATH(LASZIP_INCLUDE_DIR
-+  laszip.hpp
-+  PATH_PREFIXES laszip
-+  PATHS
-+  /usr/include
-+  /usr/local/include
-+  /tmp/lasjunk/include
-+  ${OSGEO4W_ROOT_DIR}/include)
-+
-+SET(LASZIP_NAMES ${OSGEO4W_IMPORT_LIBRARY} laszip)
-+
-+FIND_LIBRARY(LASZIP_LIBRARY
-+  NAMES ${LASZIP_NAMES}
-+  PATHS
-+  /usr/lib64
-+  /usr/lib
-+  /usr/local/lib
-+  /tmp/lasjunk/lib
-+  ${OSGEO4W_ROOT_DIR}/lib)
-+
-+IF(LASZIP_INCLUDE_DIR)
-+  SET(LASZIP_VERSION 0)
-+
-+  SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip/laszip.hpp")
-+  FILE(READ ${LASZIP_VERSION_H} LASZIP_VERSION_H_CONTENTS)
-+
-+  IF (DEFINED LASZIP_VERSION_H_CONTENTS)
-+    string(REGEX REPLACE ".*#define[ \t]LASZIP_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" LASZIP_VERSION_MAJOR "${LASZIP_VERSION_H_CONTENTS}")
-+    string(REGEX REPLACE ".*#define[ \t]LASZIP_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" LASZIP_VERSION_MINOR "${LASZIP_VERSION_H_CONTENTS}")
-+    string(REGEX REPLACE ".*#define[ \t]LASZIP_VERSION_REVISION[ \t]+([0-9]+).*"   "\\1" LASZIP_VERSION_REVISION   "${LASZIP_VERSION_H_CONTENTS}")
-+
-+    if(NOT ${LASZIP_VERSION_MAJOR} MATCHES "[0-9]+")
-+      message(FATAL_ERROR "LASzip version parsing failed for LASZIP_VERSION_MAJOR!")
-+    endif()
-+    if(NOT ${LASZIP_VERSION_MINOR} MATCHES "[0-9]+")
-+      message(FATAL_ERROR "LASzip version parsing failed for LASZIP_VERSION_MINOR!")
-+    endif()
-+    if(NOT ${LASZIP_VERSION_REVISION} MATCHES "[0-9]+")
-+      message(FATAL_ERROR "LASzip version parsing failed for LASZIP_VERSION_REVISION!")
-+    endif()
-+
-+
-+    SET(LASZIP_VERSION "${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}.${LASZIP_VERSION_REVISION}"
-+      CACHE INTERNAL "The version string for LASzip library")
-+
-+    IF (LASZIP_VERSION VERSION_EQUAL LASzip_FIND_VERSION OR
-+        LASZIP_VERSION VERSION_GREATER LASzip_FIND_VERSION)
-+    ELSE()
-+      MESSAGE(FATAL_ERROR "LASzip version check failed. Version ${LASZIP_VERSION} was found, at least version ${LASzip_FIND_VERSION} is required")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Failed to open ${LASZIP_VERSION_H} file")
-+  ENDIF()
-+
-+ENDIF()
-+
-+#---
-+# This function sets LASZIP_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LASzip DEFAULT_MSG LASZIP_LIBRARY LASZIP_INCLUDE_DIR)
-+
-+if( LASZIP_FOUND )
-+   if( NOT LASZIP_FIND_QUIETLY )
-+      message( STATUS "Found LASzip..." )
-+   endif( NOT LASZIP_FIND_QUIETLY )
-+else( LASZIP_FOUND )
-+   if( NOT LASZIP_FIND_QUIETLY )
-+      message( WARNING "Could not find LASzip" )
-+   endif( NOT LASZIP_FIND_QUIETLY )
-+endif( LASZIP_FOUND )
-+
-+#---
-+# Show the caller what was found regardless of LASZIP_FOUND variable:
-+#---
-+if( NOT LASZIP_FIND_QUIETLY )
-+   message( STATUS "LASZIP_INCLUDE_DIR=${LASZIP_INCLUDE_DIR}" )
-+   message( STATUS "LASZIP_LIBRARY=${LASZIP_LIBRARY}" )
-+   message( STATUS "Found LASzip version: ${LASZIP_VERSION}")
-+endif( NOT LASZIP_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindLIBLAS.cmake
-@@ -0,0 +1,103 @@
-+#---
-+# File: FindLIBLAS.cmake
-+#
-+# Find the native LIBLAS includes and library
-+#
-+#  LIBLAS_INCLUDE_DIRS - where to find liblas's includes.
-+#  LIBLAS_LIBRARIES    - List of libraries when using liblas.
-+#  LIBLAS_FOUND        - True if liblas found.
-+#---
-+
-+
-+# Set the include dir:
-+find_path(LIBLAS_INCLUDE_DIR liblas/liblas.hpp)
-+
-+# Macro for setting libraries:
-+macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
-+
-+  find_library(
-+    "${MYLIBRARY}_DEBUG"
-+    NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-+    PATHS
-+    ${LIBLAS_DIR}/lib/Debug
-+    ${LIBLAS_DIR}/lib64/Debug
-+    ${LIBLAS_DIR}/lib
-+    ${LIBLAS_DIR}/lib64
-+    $ENV{LIBLAS_DIR}/lib/debug
-+    $ENV{LIBLAS_DIR}/lib64/debug
-+    NO_DEFAULT_PATH
-+  )
-+
-+  find_library(
-+    "${MYLIBRARY}_DEBUG"
-+    NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-+    PATHS
-+    ~/Library/Frameworks
-+    /Library/Frameworks
-+    /usr/local/lib
-+    /usr/local/lib64
-+    /usr/lib
-+    /usr/lib64
-+    /sw/lib
-+    /opt/local/lib
-+    /opt/csw/lib
-+    /opt/lib
-+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;LIBLAS_ROOT]/lib
-+    /usr/freeware/lib64
-+  )
-+    
-+  find_library(
-+    ${MYLIBRARY}
-+    NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
-+    PATHS
-+    ${LIBLAS_DIR}/lib/Release
-+    ${LIBLAS_DIR}/lib64/Release
-+    ${LIBLAS_DIR}/lib
-+    ${LIBLAS_DIR}/lib64
-+    $ENV{LIBLAS_DIR}/lib/Release
-+    $ENV{LIBLAS_DIR}/lib64/Release
-+    $ENV{LIBLAS_DIR}/lib
-+    $ENV{LIBLAS_DIR}/lib64
-+    $ENV{LIBLAS_DIR}
-+    $ENV{LIBLASDIR}/lib
-+    $ENV{LIBLASDIR}/lib64
-+    $ENV{LIBLASDIR}
-+    $ENV{LIBLAS_ROOT}/lib
-+    $ENV{LIBLAS_ROOT}/lib64
-+    NO_DEFAULT_PATH
-+  )
-+
-+  find_library(
-+    ${MYLIBRARY}
-+    NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
-+    PATHS
-+    ~/Library/Frameworks
-+    /Library/Frameworks
-+    /usr/local/lib
-+    /usr/local/lib64
-+    /usr/lib
-+    /usr/lib64
-+    /sw/lib
-+    /opt/local/lib
-+    /opt/csw/lib
-+    /opt/lib
-+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;LIBLAS_ROOT]/lib
-+    /usr/freeware/lib64
-+  )
-+    
-+  if( NOT ${MYLIBRARY}_DEBUG )
-+    if( MYLIBRARY )
-+      set( ${MYLIBRARY}_DEBUG ${MYLIBRARY} )
-+    endif(MYLIBRARY)	
-+  endif( NOT ${MYLIBRARY}_DEBUG )
-+           
-+endmacro(FIND_LIBLAS_LIBRARY LIBRARY LIBRARYNAME)
-+
-+FIND_LIBLAS_LIBRARY(LIBLAS_LIBRARY las)
-+FIND_LIBLAS_LIBRARY(LIBLASC_LIBRARY las_c)
-+
-+set(LIBLAS_FOUND "NO")
-+if(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR)
-+  set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} )
-+  set(LIBLAS_FOUND "YES")
-+endif(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR)
---- /dev/null
-+++ b/ossim/CMakeModules/FindMiniZip.cmake
++++ ossim/ossim/CMakeModules/FindMiniZip.cmake
 @@ -0,0 +1,26 @@
 +# - Find minizip
 +# Find the native MINIZIP includes and library
@@ -807,725 +360,7 @@ Forwarded: not-needed
 +INCLUDE(FindPackageHandleStandardArgs)
 +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MINIZIP DEFAULT_MSG MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindMrSid.cmake
-@@ -0,0 +1,88 @@
-+# - Find MrSid
-+# Find the native MrSid includes and library
-+# This module defines
-+#  MRSID_INCLUDE_DIR, where to header files.
-+#  MRSID_LIBRARIES, the libraries needed to use mrsid.
-+#  MRSID_FOUND, If false, do not try to use mrsid.
-+
-+#=============================================================================
-+# 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 the include dirs:
-+#---
-+FIND_PATH( MRSID_RASTER_INCLUDE_DIR MrSIDImageReader.h
-+           ${MRSID_DIR}/Raster_DSDK/include )
-+
-+FIND_PATH( MRSID_LIDAR_INCLUDE_DIR lidar/MG4PointReader.h
-+           ${MRSID_DIR}/Lidar_DSDK/include )
-+
-+#---
-+# Find the Geo_DSDK (decode) library.
-+#----
-+# SET(MRSID_RASTER_DSDK_C_NAMES lti_dsdk_cdll ltidsdk_c libltidsdkc)
-+# FIND_LIBRARY( MRSID_RASTER_DSDK_C_LIBRARY 
-+#	      NAMES ${MRSID_RASTER_DSDK_C_NAMES} 
-+#              PATHS
-+#              ${MRSID_DIR}/Raster_DSDK/lib )
-+
-+SET(MRSID_RASTER_DSDK_NAMES lti_dsdk ltidsdk libltidsdk)
-+FIND_LIBRARY( MRSID_RASTER_DSDK_LIBRARY 
-+	      NAMES ${MRSID_RASTER_DSDK_NAMES} 
-+              PATHS
-+              ${MRSID_DIR}/Raster_DSDK/lib )
-+
-+SET(MRSID_LIDAR_DSDK_NAMES lti_lidar_dsdk liblti_lidar_dsdk )
-+FIND_LIBRARY( MRSID_LIDAR_DSDK_LIBRARY NAMES ${MRSID_LIDAR_DSDK_NAMES} 
-+              PATHS
-+              ${MRSID_DIR}/Lidar_DSDK/lib )
-+
-+# handle the QUIETLY and REQUIRED arguments and set MRSID_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MRSID DEFAULT_MSG MRSID_RASTER_INCLUDE_DIR MRSID_LIDAR_INCLUDE_DIR MRSID_RASTER_DSDK_LIBRARY MRSID_LIDAR_DSDK_LIBRARY)
-+
-+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(MRSID DEFAULT_MSG MRSID_RASTER_INCLUDE_DIR MRSID_LIDAR_INCLUDE_DIR MRSID_RASTER_DSDK_LIBRARY MRSID_RASTER_DSDK_C_LIBRARY MRSID_LIDAR_DSDK_LIBRARY)
-+
-+IF(MRSID_FOUND)
-+   # Combine the includes into MRSID_INCLUDE_DIR variable:
-+   set(MRSID_INCLUDE_DIR ${MRSID_RASTER_INCLUDE_DIR} ${MRSID_LIDAR_INCLUDE_DIR})
-+
-+   # Combine the libraries into MRSID_LIBRARY variable:
-+   set(MRSID_LIBRARY ${MRSID_RASTER_DSDK_LIBRARY} ${MRSID_LIDAR_DSDK_LIBRARY})
-+
-+   # set(MRSID_LIBRARY ${MRSID_RASTER_DSDK_C_LIBRARY} ${MRSID_RASTER_DSDK_LIBRARY} ${MRSID_LIDAR_DSDK_LIBRARY})
-+
-+  #---
-+  # Find the Geo_ESDK (encode) library.
-+  #----
-+  SET(MRSID_ESDK_NAMES ${MRSID_ESDK_NAMES} ltiesdk libltiesdk)
-+  FIND_LIBRARY(MRSID_ESDK_LIBRARY NAMES ${MRSID_ESDK_NAMES})
-+
-+  #---
-+  # Find the two includes need for the writer.
-+  #---
-+  FIND_FILE(MG2IMAGEWRITER_H MG2ImageWriter.h ${MRSID_INCLUDE_DIR})
-+  FIND_FILE(MG3IMAGEWRITER_H MG3ImageWriter.h ${MRSID_INCLUDE_DIR})
-+
-+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(MRSID_WRITE DEFAULT_MSG MRSID_ESDK_LIBRARY MG2IMAGEWRITER_H MG3IMAGEWRITER_H)  
-+
-+  IF(MRSID_WRITE_FOUND)
-+    add_definitions(-DOSSIM_ENABLE_MRSID_WRITE)
-+    SET(MRSID_LIBRARY ${MRSID_DSDK_LIBRARY} ${MRSID_ESDK_LIBRARY})
-+  ENDIF(MRSID_WRITE_FOUND)
-+  SET(MRSID_LIBRARIES ${MRSID_LIBRARY})
-+ENDIF(MRSID_FOUND)
-+
-+MARK_AS_ADVANCED(MRSID_LIBRARIES MRSID_INCLUDE_DIR )
---- /dev/null
-+++ b/ossim/CMakeModules/FindOMS.cmake
-@@ -0,0 +1,44 @@
-+# - Find ossim library
-+# Find the native ossim includes and library
-+# This module defines
-+#  OMS_INCLUDE_DIR, where to find tiff.h, etc.
-+#  OMS_LIBRARIES, libraries to link against to use OSSIM.
-+#  OMS_FOUND, If false, do not try to use OSSIM.
-+# also defined, but not for general use are
-+#  OMS_LIBRARY, where to find the OSSIM library.
-+
-+SET(CMAKE_FIND_FRAMEWORK "LAST")
-+FIND_PATH(OMS_INCLUDE_DIR oms/ossimVersion.h
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/oms/coms/include
-+		$ENV{OSSIM_DEV_HOME}/oms/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}/include
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/oms/coms
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		include
-+)
-+SET(OSSIM_NAMES ${OSSIM_NAMES} oms )
-+FIND_LIBRARY(OSSIM_LIBRARY NAMES ${OSSIM_NAMES}
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/ossim/lib
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/ossim/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		Frameworks
-+)
-+
-+# handle the QUIETLY and REQUIRED arguments and set OSSIM_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OMS  DEFAULT_MSG  OMS_LIBRARY  OMS_INCLUDE_DIR)
-+
-+IF(OMS_FOUND)
-+  SET( OMS_LIBRARIES ${OMS_LIBRARY} )
-+ENDIF(OMS_FOUND)
-+
-+MARK_AS_ADVANCED(OMS_INCLUDE_DIR OMS_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindOSG.cmake
-@@ -0,0 +1,124 @@
-+# Locate gdal
-+# This module defines
-+# OSG_LIBRARY
-+# OSG_FOUND, if false, do not try to link to gdal 
-+# OSG_INCLUDE_DIR, where to find the headers
-+#
-+# $OSG_DIR is an environment variable that would
-+# correspond to the ./configure --prefix=$OSG_DIR
-+#
-+# Created by Robert Osfield. 
-+
-+FIND_PATH(OSG_INCLUDE_DIR osg/Node
-+    ${OSG_DIR}/include
-+    $ENV{OSG_DIR}/include
-+    $ENV{OSG_DIR}
-+    $ENV{OSGDIR}/include
-+    $ENV{OSGDIR}
-+    $ENV{OSG_ROOT}/include
-+    NO_DEFAULT_PATH
-+)
-+
-+FIND_PATH(OSG_INCLUDE_DIR osg/Node)
-+
-+MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
-+
-+    FIND_LIBRARY("${MYLIBRARY}_DEBUG"
-+        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-+        PATHS
-+        ${OSG_DIR}/lib/Debug
-+        ${OSG_DIR}/lib64/Debug
-+        ${OSG_DIR}/lib
-+        ${OSG_DIR}/lib64
-+        $ENV{OSG_DIR}/lib/debug
-+        $ENV{OSG_DIR}/lib64/debug
-+        $ENV{OSG_DIR}/lib
-+        $ENV{OSG_DIR}/lib64
-+        $ENV{OSG_DIR}
-+        $ENV{OSGDIR}/lib
-+        $ENV{OSGDIR}/lib64
-+        $ENV{OSGDIR}
-+        $ENV{OSG_ROOT}/lib
-+        $ENV{OSG_ROOT}/lib64
-+        NO_DEFAULT_PATH
-+    )
-+
-+    FIND_LIBRARY("${MYLIBRARY}_DEBUG"
-+        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-+        PATHS
-+        ~/Library/Frameworks
-+        /Library/Frameworks
-+        /usr/local/lib
-+        /usr/local/lib64
-+        /usr/lib
-+        /usr/lib64
-+        /sw/lib
-+        /opt/local/lib
-+        /opt/csw/lib
-+        /opt/lib
-+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-+        /usr/freeware/lib64
-+    )
-+    
-+    FIND_LIBRARY(${MYLIBRARY}
-+        NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
-+        PATHS
-+        ${OSG_DIR}/lib/Release
-+        ${OSG_DIR}/lib64/Release
-+        ${OSG_DIR}/lib
-+        ${OSG_DIR}/lib64
-+        $ENV{OSG_DIR}/lib/Release
-+        $ENV{OSG_DIR}/lib64/Release
-+        $ENV{OSG_DIR}/lib
-+        $ENV{OSG_DIR}/lib64
-+        $ENV{OSG_DIR}
-+        $ENV{OSGDIR}/lib
-+        $ENV{OSGDIR}/lib64
-+        $ENV{OSGDIR}
-+        $ENV{OSG_ROOT}/lib
-+        $ENV{OSG_ROOT}/lib64
-+        NO_DEFAULT_PATH
-+    )
-+
-+    FIND_LIBRARY(${MYLIBRARY}
-+        NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
-+        PATHS
-+        ~/Library/Frameworks
-+        /Library/Frameworks
-+        /usr/local/lib
-+        /usr/local/lib64
-+        /usr/lib
-+        /usr/lib64
-+        /sw/lib
-+        /opt/local/lib
-+        /opt/csw/lib
-+        /opt/lib
-+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-+        /usr/freeware/lib64
-+    )
-+    
-+    IF( NOT ${MYLIBRARY}_DEBUG)
-+        IF(MYLIBRARY)
-+            SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})
-+         ENDIF(MYLIBRARY)
-+    ENDIF( NOT ${MYLIBRARY}_DEBUG)
-+           
-+ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
-+
-+FIND_OSG_LIBRARY(OSG_LIBRARY osg)
-+FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA)
-+FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil)
-+FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB)
-+FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText)
-+FIND_OSG_LIBRARY(OSGWIDGET_LIBRARY osgWidget)
-+FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain)
-+FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX)
-+FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer)
-+FIND_OSG_LIBRARY(OSGSHADOW_LIBRARY osgShadow)
-+FIND_OSG_LIBRARY(OSGVOLUME_LIBRARY osgVolume)
-+FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)
-+
-+SET(OSG_FOUND "NO")
-+IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
-+    SET(OSG_FOUND "YES")
-+ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
---- /dev/null
-+++ b/ossim/CMakeModules/FindOpenCV.cmake
-@@ -0,0 +1,85 @@
-+#---
-+# File:  FindOpenCV.cmake
-+# 
-+# Locate OPENCV
-+#
-+# This module defines:
-+#
-+# OPENCV_INCLUDE_DIR
-+#
-+# OPENCV_FOUND, 
-+# OPENCV_CORE_FOUND 
-+# OPENCV_HIGHGUI_FOUND
-+# OPENCV_IMGPROC_FOUND
-+# OPENCV_LEGACY_FOUND
-+# OPENCV_ML_FOUND 
-+#
-+# OPENCV_CORE_LIBRARY
-+# OPENCV_HIGHGUI_LIBRARY
-+# OPENCV_IMGPROC_LIBRARY
-+# OPENCV_LEGACY_LIBRARY
-+# OPENCV_ML_LIBRARY
-+# OPENCV_LIBRARIES
-+#
-+# Created by Garrett Potts.
-+#
-+# $Id: FindOpenCV.cmake 22635 2014-02-20 14:28:45Z dburken $
-+
-+# Find include path:
-+find_path(OPENCV_INCLUDE_DIR opencv2/opencv.hpp PATHS /usr/include/opencv2 /usr/local/include)
-+
-+macro(FIND_OPENCV_LIBRARY MYLIBRARY MYLIBRARYNAME)
-+
-+   find_library( ${MYLIBRARY}
-+      NAMES "${MYLIBRARYNAME}${OPENCV_RELEASE_POSTFIX}"
-+      PATHS
-+      /usr/lib64
-+      /usr/lib
-+     /usr/local/lib
-+   )
-+
-+endmacro(FIND_OPENCV_LIBRARY MYLIBRARY MYLIBRARYNAME)
-+
-+FIND_OPENCV_LIBRARY(OPENCV_CALIB3D_LIBRARY opencv_calib3d)
-+FIND_OPENCV_LIBRARY(OPENCV_CONTRIB_LIBRARY opencv_contrib)
-+FIND_OPENCV_LIBRARY(OPENCV_CORE_LIBRARY opencv_core)
-+FIND_OPENCV_LIBRARY(OPENCV_FEATURES2D_LIBRARY opencv_features2d)
-+FIND_OPENCV_LIBRARY(OPENCV_FLANN_LIBRARY opencv_flann)
-+FIND_OPENCV_LIBRARY(OPENCV_GPU_LIBRARY opencv_gpu)
-+FIND_OPENCV_LIBRARY(OPENCV_HIGHGUI_LIBRARY opencv_highgui)
-+FIND_OPENCV_LIBRARY(OPENCV_IMGPROC_LIBRARY opencv_imgproc)
-+FIND_OPENCV_LIBRARY(OPENCV_LEGACY_LIBRARY opencv_legacy)
-+FIND_OPENCV_LIBRARY(OPENCV_ML_LIBRARY opencv_ml)
-+
-+message( STATUS "OPENCV_INCLUDE_DIR        = ${OPENCV_INCLUDE_DIR}" )
-+message( STATUS "OPENCV_CALIB3D_LIBRARY    = ${OPENCV_CALIB3D_LIBRARY}" )
-+message( STATUS "OPENCV_CONTRIB_LIBRARY    = ${OPENCV_CONTRIB_LIBRARY}" )
-+message( STATUS "OPENCV_CORE_LIBRARY       = ${OPENCV_CORE_LIBRARY}" )
-+message( STATUS "OPENCV_FEATURES2D_LIBRARY = ${OPENCV_FEATURES2D_LIBRARY}" )
-+message( STATUS "OPENCV_FLANN_LIBRARY      = ${OPENCV_FLANN_LIBRARY}" )
-+message( STATUS "OPENCV_GPU_LIBRARY        = ${OPENCV_GPU_LIBRARY}" )
-+message( STATUS "OPENCV_HIGHGUI_LIBRARY    = ${OPENCV_HIGHGUI_LIBRARY}" )
-+message( STATUS "OPENCV_IMGPROC_LIBRARY    = ${OPENCV_IMGPROC_LIBRARY}" )
-+message( STATUS "OPENCV_LEGACY_LIBRARY     = ${OPENCV_LEGACY_LIBRARY}" )
-+message( STATUS "OPENCV_ML_LIBRARY         = ${OPENCV_ML_LIBRARY}" )
-+
-+
-+# Removed OPENCV_GPU_LIBRARY AND (drb 20140220)
-+
-+set(OPENCV_FOUND "NO")
-+
-+if(OPENCV_INCLUDE_DIR AND OPENCV_CALIB3D_LIBRARY AND OPENCV_CONTRIB_LIBRARY AND OPENCV_CORE_LIBRARY AND OPENCV_FEATURES2D_LIBRARY AND OPENCV_FLANN_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
-+
-+   set(OPENCV_FOUND "YES")
-+
-+   # Removed ${OPENCV_GPU_LIBRARY} (drb 20140220)
-+
-+   set(OPENCV_LIBRARIES ${OPENCV_CALIB3D_LIBRARY} ${OPENCV_CONTRIB_LIBRARY} ${OPENCV_CORE_LIBRARY} ${OPENCV_FEATURES2D_LIBRARY} ${OPENCV_FLANN_LIBRARY} ${OPENCV_HIGHGUI_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${OPENCV_LEGACY_LIBRARY} ${OPENCV_ML_LIBRARY})
-+
-+   message( STATUS "OPENCV_LIBRARIES        = ${OPENCV_LIBRARIES}" )
-+
-+else(OPENCV_INCLUDE_DIR AND OPENCV_CORE_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
-+
-+   message( WARNING "Could not find OPENCV" )
-+
-+endif(OPENCV_INCLUDE_DIR AND OPENCV_CALIB3D_LIBRARY AND OPENCV_CONTRIB_LIBRARY AND OPENCV_CORE_LIBRARY AND OPENCV_FEATURES2D_LIBRARY AND OPENCV_FLANN_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindOpenJPEG.cmake
-@@ -0,0 +1,56 @@
-+###
-+# -*- cmake -*-
-+#
-+# File:  FindOpenJPEG.cmake
-+#
-+# Original script was copied from:
-+# http://code.google.com/p/emeraldviewer/source/browse/indra/cmake
-+#
-+# $Id: FindOpenJPEG.cmake 21190 2012-06-29 19:54:24Z dburken $
-+###
-+
-+# - Find OpenJPEG
-+# Find the OpenJPEG includes and library
-+# This module defines
-+#  OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
-+#  OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
-+#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
-+# also defined, but not for general use are
-+#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-+
-+FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
-+  PATHS
-+    /usr/local/include/openjpeg
-+    /usr/local/include
-+    /usr/include/openjpeg
-+    /usr/include
-+  PATH_SUFFIXES
-+    openjpeg-2.0
-+  DOC "Location of OpenJPEG Headers"
-+)
-+
-+SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
-+FIND_LIBRARY(OPENJPEG_LIBRARY
-+  NAMES ${OPENJPEG_NAMES}
-+  PATHS /usr/lib /usr/local/lib
-+  )
-+
-+IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-+    SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-+    SET(OPENJPEG_FOUND "YES")
-+ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-+  SET(OPENJPEG_FOUND "NO")
-+ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-+
-+
-+IF (OPENJPEG_FOUND)
-+   IF (NOT OPENJPEG_FIND_QUIETLY)
-+      MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
-+   ENDIF (NOT OPENJPEG_FIND_QUIETLY)
-+ELSE (OPENJPEG_FOUND)
-+   IF (OPENJPEG_FIND_REQUIRED)
-+      MESSAGE(FATAL_ERROR "Could not find OpenJPEG library")
-+   ENDIF (OPENJPEG_FIND_REQUIRED)
-+ENDIF (OPENJPEG_FOUND)
-+
-+MARK_AS_ADVANCED(OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)
---- /dev/null
-+++ b/ossim/CMakeModules/FindPDAL.cmake
-@@ -0,0 +1,57 @@
-+#---
-+# File: FindPDAL.cmake
-+#
-+# Find the native Point Data Abstractin Library(PDAL) includes and libraries.
-+#
-+# This module defines:
-+#
-+# PDAL_INCLUDE_DIR, where to find pdal.h, etc.
-+# PDAL_LIBRARY, libraries to link against to use PDAL.
-+# PDAL_FOUND, True if found, false if one of the above are not found.
-+# 
-+# NOTE: 
-+# This script is specialized for ossim, e.g. looking in /usr/local/ossim.
-+#
-+# $Id$
-+#---
-+
-+#---
-+# Find include path:  "pdal_defines.h" installs to install "prefix" with pdal 
-+# includes under "pdal" sub directory.
-+#---
-+find_path( PDAL_INCLUDE_DIR pdal/pdal_defines.h
-+           PATHS 
-+           /usr/include
-+           /usr/local/include
-+           /usr/local/ossim/include )
-+
-+# Find PDAL library:
-+find_library( PDAL_LIBRARY NAMES pdalcpp pdal 
-+              PATHS 
-+              /usr/lib64 
-+              /usr/lib 
-+              /usr/local/lib
-+              /usr/local/ossim/lib )
-+
-+#---
-+# This function sets PDAL_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( PDAL DEFAULT_MSG 
-+                                   PDAL_LIBRARY 
-+                                   PDAL_INCLUDE_DIR )
-+
-+if( PDAL_FOUND )
-+   if( NOT PDAL_FIND_QUIETLY )
-+      message( STATUS "Found PDAL..." )
-+   endif( NOT PDAL_FIND_QUIETLY )
-+else( PDAL_FOUND )
-+   if( NOT PDAL_FIND_QUIETLY )
-+      message( WARNING "Could not find PDAL" )
-+   endif( NOT PDAL_FIND_QUIETLY )
-+endif( PDAL_FOUND )
-+
-+if( NOT PDAL_FIND_QUIETLY )
-+   message( STATUS "PDAL_INCLUDE_DIR=${PDAL_INCLUDE_DIR}" )
-+   message( STATUS "PDAL_LIBRARY=${PDAL_LIBRARY}" )
-+endif( NOT PDAL_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindPodofo.cmake
-@@ -0,0 +1,25 @@
-+#---
-+# File: FindPodofo.cmake
-+#
-+# Find the native podofo includes and library
-+#
-+# This module defines:
-+#  PODOFO_INCLUDE_DIR, where to find tiff.h, etc.
-+#  PODOFO_LIBRARY, library to link against to use PODOFO.
-+#  PODOFO_FOUND, If false, do not try to use PODOFO.
-+# 
-+# $Id: FindPodofo.cmake 19868 2011-07-23 13:23:49Z dburken $
-+#---
-+
-+# Find include path:
-+find_path(PODOFO_INCLUDE_DIR podofo/podofo.h PATHS /usr/include /usr/local/include
-+)
-+
-+# Find library:
-+find_library(PODOFO_LIBRARY NAMES podofo PATHS /usr/lib64 /usr/lib /usr/local/lib)
-+
-+#---
-+# This function sets PODOFO_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PODOFO  DEFAULT_MSG  PODOFO_LIBRARY  PODOFO_INCLUDE_DIR)
---- /dev/null
-+++ b/ossim/CMakeModules/FindQt5.cmake
-@@ -0,0 +1,165 @@
-+# - Find Qt5
-+# This module can be used to find Qt5.
-+# The most important issues are that Qt5 pkgconfig files are installed with PKG_CONFIG_PATH properly
-+# set, and that Qt5 qmake is available via the system path.
-+# This module defines a number of key variables and macros.
-+#
-+#  Below is a detailed list of variables that FindQt5.cmake sets.
-+#  QT_FOUND                     If false, don't try to use Qt.
-+#  QT5_FOUND                    If false, don't try to use Qt5.
-+#
-+#  QT_VERSION_MAJOR             The major version of Qt found.
-+#  QT_VERSION_MINOR             The minor version of Qt found.
-+#  QT_VERSION_PATCH             The patch version of Qt found.
-+#
-+#  QT_BINARY_DIR                Path to "bin" of Qt4
-+#  QT_DOC_DIR                   Path to "doc" of Qt4
-+#
-+#  QT_QTCORE_FOUND              True if QtCore was found.
-+#  QT_QTGUI_FOUND               True if QtGui was found.
-+#  QT_QTDBUS_FOUND              True if QtDBus was found.
-+#  QT_QTNETWORK_FOUND           True if QtNetwork was found.
-+#  QT_QTTEST_FOUND              True if QtTest was found.
-+#  QT_QTWIDGETS_FOUND           True if QtWidgets was found.
-+#  QT_QTXML_FOUND               True if QtXml was found.
-+#
-+#  QT_INCLUDES                  List of paths to all include directories of Qt5.
-+#  QT_INCLUDE_DIR               Path to "include" of Qt4
-+#  QT_QTCORE_INCLUDE_DIR        Path to "include/QtCore"
-+#  QT_QTDBUS_INCLUDE_DIR        Path to "include/QtDBus"
-+#  QT_QTGUI_INCLUDE_DIR         Path to "include/QtGui"
-+#  QT_QTNETWORK_INCLUDE_DIR     Path to "include/QtNetwork"
-+#  QT_QTTEST_INCLUDE_DIR        Path to "include/QtTest"
-+#  QT_QTWIDGETS_INCLUDE_DIR     Path to "include/QtWidgets"
-+#  QT_QTXML_INCLUDE_DIR         Path to "include/QtXml"
-+#
-+#  QT_LIBRARIES                 List of paths to all libraries of Qt5.
-+#  QT_LIBRARY_DIR               Path to "lib" of Qt4
-+#  QT_QTCORE_LIBRARY            The QtCore library
-+#  QT_QTDBUS_LIBRARY            The QtDBus library
-+#  QT_QTGUI_LIBRARY             The QtGui library
-+#  QT_QTNETWORK_LIBRARY         The QtNetwork library
-+#  QT_QTTEST_LIBRARY            The QtTest library
-+#  QT_QTWIDGETS_LIBRARY         The QtWidgets library
-+#  QT_QTXML_LIBRARY             The QtXml library
-+#
-+# also defined, but NOT for general use are
-+#  QT_MOC_EXECUTABLE            Where to find the moc tool
-+#  QT_CONFIG_FLAGS              Flags used when building Qt
-+
-+# 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.
-+
-+IF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5)
-+  # Already in cache, be silent
-+  SET(QT_FOUND TRUE)
-+  SET(QT5_FOUND TRUE)
-+  RETURN()
-+ENDIF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5)
-+
-+IF(NOT QT_QMAKE_EXECUTABLE)
-+  FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5
-+               PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin")
-+  SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.")
-+ENDIF(NOT QT_QMAKE_EXECUTABLE)
-+
-+EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
-+IF(NOT QTVERSION MATCHES "5.*")
-+  SET(QT_FOUND FALSE)
-+  SET(QT5_FOUND FALSE)
-+  IF(Qt5_FIND_REQUIRED)
-+    MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.")
-+  ENDIF(Qt5_FIND_REQUIRED)
-+  RETURN()
-+ENDIF(NOT QTVERSION MATCHES "5.*")
-+
-+# FIND_PACKAGE(PkgConfig REQUIRED)
-+
-+IF(NOT Qt5_FIND_COMPONENTS)
-+  SET(_COMPONENTS QtCore QtDBus QtGui QtNetwork QtTest QtWidgets QtXml)
-+ELSE(NOT Qt5_FIND_COMPONENTS)
-+  SET(_COMPONENTS ${Qt5_FIND_COMPONENTS})
-+ENDIF(NOT Qt5_FIND_COMPONENTS)
-+
-+FOREACH(_COMPONENT ${_COMPONENTS})
-+  STRING(TOUPPER ${_COMPONENT} _COMPONENT_UPPER)
-+  IF(NOT QT_${_COMPONENT_UPPER}_FOUND)
-+    IF(Qt5_FIND_REQUIRED)
-+      PKG_CHECK_MODULES(PC_${_COMPONENT} REQUIRED ${_COMPONENT}>=${QT_MIN_VERSION})
-+    ELSE(Qt5_FIND_REQUIRED)
-+      PKG_CHECK_MODULES(PC_${_COMPONENT} QUIET ${_COMPONENT}>=${QT_MIN_VERSION})
-+    ENDIF(Qt5_FIND_REQUIRED)
-+
-+    SET(QT_${_COMPONENT_UPPER}_INCLUDE_DIR ${PC_${_COMPONENT}_INCLUDE_DIRS})
-+
-+    FIND_LIBRARY(QT_${_COMPONENT_UPPER}_LIBRARY
-+                 NAMES ${_COMPONENT}
-+                 HINTS
-+                 ${PC_${_COMPONENT}_LIBDIR})
-+
-+    SET(QT_${_COMPONENT_UPPER}_FOUND ${PC_${_COMPONENT}_FOUND})
-+
-+    #MESSAGE(STATUS "COMPONENT ${_COMPONENT_UPPER}:")
-+    #MESSAGE(STATUS "  QT_${_COMPONENT_UPPER}_LIBRARY: ${QT_${_COMPONENT_UPPER}_LIBRARY}")
-+    #MESSAGE(STATUS "  QT_${_COMPONENT_UPPER}_INCLUDE_DIR: ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}")
-+    #MESSAGE(STATUS "  QT_${_COMPONENT_UPPER}_FOUND: ${QT_${_COMPONENT_UPPER}_FOUND}")
-+
-+    SET(QT_INCLUDES ${QT_INCLUDES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR})
-+    SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR})
-+    MARK_AS_ADVANCED(QT_${_COMPONENT_UPPER}_LIBRARY QT_${_COMPONENT_UPPER}_INCLUDE_DIR)
-+  ENDIF(NOT QT_${_COMPONENT_UPPER}_FOUND)
-+ENDFOREACH(_COMPONENT)
-+
-+#MESSAGE(STATUS "QT_LIBRARIES: ${QT_LIBRARIES}")
-+#MESSAGE(STATUS "QT_INCLUDES: ${QT_INCLUDES}")
-+
-+STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
-+STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
-+STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
-+
-+IF(NOT QT_INCLUDE_DIR)
-+  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QTHEADERS)
-+  SET(QT_INCLUDE_DIR ${QTHEADERS} CACHE INTERNAL "" FORCE)
-+ENDIF(NOT QT_INCLUDE_DIR)
-+
-+IF(NOT QT_LIBRARY_DIR)
-+  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QTLIBS)
-+  SET(QT_LIBRARY_DIR ${QTLIBS} CACHE INTERNAL "" FORCE)
-+ENDIF(NOT QT_LIBRARY_DIR)
-+
-+IF(NOT QT_BINARY_DIR)
-+  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE QTBINS)
-+  SET(QT_BINARY_DIR ${QTBINS} CACHE INTERNAL "" FORCE)
-+ENDIF(NOT QT_BINARY_DIR)
-+
-+IF(NOT QT_DOC_DIR)
-+  EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_DOCS" OUTPUT_VARIABLE QTDOCS)
-+  SET(QT_DOC_DIR ${QTDOCS} CACHE INTERNAL "" FORCE)
-+ENDIF(NOT QT_DOC_DIR)
-+
-+IF(NOT QT_MOC_EXECUTABLE)
-+  FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc moc5 moc-qt5 PATHS ${QT_BINARY_DIR}
-+               NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-+ENDIF(NOT QT_MOC_EXECUTABLE)
-+
-+MARK_AS_ADVANCED(QT_INCLUDES QT_INCLUDE_DIR
-+                 QT_LIBRARIES QT_LIBRARY_DIR
-+                 QT_BINARY_DIR
-+                 QT_DOC_DIR
-+                 QT_QMAKE_EXECUTABLE_FINDQT QT_QMAKE_EXECUTABLE QT_MOC_EXECUTABLE)
-+
-+# Invokes pkgconfig, cleans up the result and sets variables
-+#EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable qt_config QtCore
-+#    OUTPUT_VARIABLE _pkgconfig_flags
-+#    RESULT_VARIABLE _pkgconfig_failed)
-+#STRING(REPLACE " " ";" QT_CONFIG_FLAGS "${_pkgconfig_flags}")
-+
-+INCLUDE(Qt5Macros)
-+
-+SET(QT_FOUND TRUE)
-+SET(QT5_FOUND TRUE)
-+
---- /dev/null
-+++ b/ossim/CMakeModules/FindRapier.cmake
-@@ -0,0 +1,47 @@
-+#---
-+# File: FindRapier.cmake
-+#
-+# Find the native rapier includes and library
-+#
-+# This module defines
-+#  RAPIER_INCLUDE_DIR, where to find tiff.h, etc.
-+#  RAPIER_LIBRARIES, libraries to link against to use RAPIER.
-+#  RAPIER_FOUND, If false, do not try to use RAPIER.
-+# also defined, but not for general use are
-+#  RAPIER_LIBRARY, where to find the RAPIER library.
-+# 
-+# $Id: FindRapier.cmake 21190 2012-06-29 19:54:24Z dburken $
-+#---
-+
-+find_path(RAPIER_INCLUDE_DIR rapier/common/rapierConstants.h
-+   HINTS	
-+      $ENV{OSSIM_DEV_HOME}/Rapier/include
-+      $ENV{OSSIM_INSTALL_PREFIX}/include
-+   PATHS
-+      $ENV{OSSIM_DEV_HOME}/Rapier
-+      $ENV{OSSIM_INSTALL_PREFIX}
-+   PATH_SUFFIXES 
-+      include
-+)
-+
-+find_library(RAPIER_LIBRARY
-+   NAMES rapier
-+   HINTS 
-+      $ENV{OSSIM_DEV_HOME}/Rapier/lib
-+      $ENV{OSSIM_DEV_HOME}/build/lib
-+   PATHS
-+      $ENV{OSSIM_DEV_HOME}/Rapier/lib
-+      $ENV{OSSIM_INSTALL_PREFIX}
-+   PATH_SUFFIXES 
-+      lib
-+)
-+
-+#---
-+# This function sets RAPIER_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(RAPIER  DEFAULT_MSG  RAPIER_LIBRARY  RAPIER_INCLUDE_DIR)
-+
-+if(RAPIER_FOUND)
-+  set( RAPIER_LIBRARIES ${RAPIER_LIBRARY} )
-+endif(RAPIER_FOUND)
---- /dev/null
-+++ b/ossim/CMakeModules/FindRegex.cmake
++++ ossim/ossim/CMakeModules/FindRegex.cmake
 @@ -0,0 +1,64 @@
 +#                                               -*- cmake -*-
 +#
@@ -1592,71 +427,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindSQLITE.cmake
-@@ -0,0 +1,61 @@
-+#---
-+# File: FindSQLITE.cmake
-+#
-+# Find the native SQLite includes and libraries.
-+#
-+# This module defines:
-+#
-+# SQLITE_INCLUDE_DIR, where to find sqlite3.h, etc.
-+# SQLITE_LIBRARY, libraries to link against to use SQLITE.
-+# SQLITE_FOUND, True if found, false if one of the above are not found.
-+# 
-+# For ossim, typically SQLite will be system installed which should be found; 
-+# or found in the ossim 3rd party dependencies directory from a SQLite 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.
-+# 
-+# $Id$
-+#---
-+
-+#---
-+# Find include path:
-+#---
-+find_path( SQLITE_INCLUDE_DIR sqlite3.h
-+           PATHS 
-+           /usr/include
-+           /usr/local/include )
-+
-+# Find SQLITE library:
-+find_library( SQLITE_LIB NAMES sqlite3
-+              PATHS 
-+              /usr/lib64 
-+              /usr/lib 
-+              /usr/local/lib )
-+
-+# Set the SQLITE_LIBRARY:
-+if( SQLITE_LIB )
-+   set( SQLITE_LIBRARY ${SQLITE_LIB} CACHE STRING INTERNAL )
-+endif(SQLITE_LIB )
-+
-+#---
-+# This function sets SQLITE_FOUND if variables are valid.
-+#--- 
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args( SQLITE DEFAULT_MSG 
-+                                   SQLITE_LIBRARY 
-+                                   SQLITE_INCLUDE_DIR )
-+
-+if( SQLITE_FOUND )
-+   if( NOT SQLITE_FIND_QUIETLY )
-+      message( STATUS "Found SQLITE..." )
-+   endif( NOT SQLITE_FIND_QUIETLY )
-+else( SQLITE_FOUND )
-+   if( NOT SQLITE_FIND_QUIETLY )
-+      message( WARNING "Could not find SQLITE" )
-+   endif( NOT SQLITE_FIND_QUIETLY )
-+endif( SQLITE_FOUND )
-+
-+if( NOT SQLITE_FIND_QUIETLY )
-+   message( STATUS "SQLITE_INCLUDE_DIR=${SQLITE_INCLUDE_DIR}" )
-+   message( STATUS "SQLITE_LIBRARY=${SQLITE_LIBRARY}" )
-+endif( NOT SQLITE_FIND_QUIETLY )
---- /dev/null
-+++ b/ossim/CMakeModules/FindStlPort.cmake
++++ ossim/ossim/CMakeModules/FindStlPort.cmake
 @@ -0,0 +1,26 @@
 +#---
 +# $Id: FindStlPort.cmake 21190 2012-06-29 19:54:24Z dburken $
@@ -1685,7 +456,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(STLPORT_INCLUDE_DIR STLPORT_LIBRARY)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindSubversion.cmake
++++ ossim/ossim/CMakeModules/FindSubversion.cmake
 @@ -0,0 +1,148 @@
 +# - Extract information from a subversion working copy
 +# The module defines the following variables:
@@ -1836,8 +607,8 @@ Forwarded: not-needed
 +   message( STATUS "Subversion_VERSION_SVN=${Subversion_VERSION_SVN}" )
 +endif( NOT SUBVERSION_FIND_QUIETLY )
 --- /dev/null
-+++ b/ossim/CMakeModules/FindTIFF.cmake
-@@ -0,0 +1,41 @@
++++ ossim/ossim/CMakeModules/FindTIFF.cmake
+@@ -0,0 +1,52 @@
 +# - Find TIFF library
 +# Find the native TIFF includes and library
 +# This module defines
@@ -1860,14 +631,25 @@ Forwarded: not-needed
 +# (To distribute this file outside of CMake, substitute the full
 +#  License text for the above reference.)
 +
-+FIND_PATH(TIFF_INCLUDE_DIR tiff.h)
++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 /usr/lib /usr/lib/x86_64-linux-gnu)
++             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
@@ -1880,107 +662,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindWMS.cmake
-@@ -0,0 +1,48 @@
-+# - Find wms library
-+# Find the native wms includes and library
-+# This module defines
-+#  WMS_INCLUDE_DIR, where to find tiff.h, etc.
-+#  WMS_LIBRARIES, libraries to link against to use WMS.
-+#  WMS_FOUND, If false, do not try to use WMS.
-+# also defined, but not for general use are
-+#  WMS_LIBRARY, where to find the WMS library.
-+SET(CMAKE_FIND_FRAMEWORK "LAST")
-+FIND_PATH(WMS_INCLUDE_DIR wms/wms.h
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/libwms/include
-+		$ENV{OSSIM_DEV_HOME}/libwms/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}/include
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/libwms
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		include
-+
-+)
-+
-+SET(WMS_NAMES ${WMS_NAMES} wms libwms)
-+FIND_LIBRARY(WMS_LIBRARY NAMES ${WMS_NAMES} 
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/liwms/lib
-+		$ENV{OSSIM_DEV_HOME}/libwms
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/libwms/lib
-+		$ENV{OSSIM_DEV_HOME}/libwms
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		Frameworks
-+)
-+
-+# handle the QUIETLY and REQUIRED arguments and set WMS_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(WMS  DEFAULT_MSG  WMS_LIBRARY  WMS_INCLUDE_DIR)
-+
-+IF(WMS_FOUND)
-+  SET( WMS_LIBRARIES ${WMS_LIBRARY} )
-+ENDIF(WMS_FOUND)
-+
-+MARK_AS_ADVANCED(WMS_INCLUDE_DIR WMS_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindcsmApi.cmake
-@@ -0,0 +1,46 @@
-+# - Find csmApi library
-+# Find the native csmApi includes and library
-+# This module defines
-+#  CSMAPI_INCLUDE_DIRS, where to find cam api headers, etc.
-+#  CSMAPI_LIBRARIES, libraries to link against to use csmApi.
-+#  CSMAPI_FOUND, If false, do not try to use csmApi.
-+# also defined, but not for general use are
-+#  CSMAPI_LIBRARY, where to find the CSMAPI library.
-+SET(CMAKE_FIND_FRAMEWORK "LAST")
-+FIND_PATH(CSMAPI_INCLUDE_DIRS SMManager.h
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/csmApi/include
-+		$ENV{OSSIM_DEV_HOME}/csmApi/include/TSM
-+		$ENV{OSSIM_DEV_HOME}/csmApi/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}/include
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/csmApi/include
-+		$ENV{OSSIM_DEV_HOME}/csmApi/include/TSM
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		include
-+)
-+
-+SET(CSMAPI_NAMES ${CSMAPI_NAMES} csmApi libcsmApi)
-+FIND_LIBRARY(CSMAPI_LIBRARY NAMES ${CSMAPI_NAMES}
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/csmApi/lib
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/csmApi/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		Frameworks
-+)
-+
-+# handle the QUIETLY and REQUIRED arguments and set CSMAPI_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CSMAPI  DEFAULT_MSG  CSMAPI_LIBRARY  CSMAPI_INCLUDE_DIR)
-+
-+IF(CSMAPI_FOUND)
-+  SET( CSMAPI_LIBRARIES ${CSMAPI_LIBRARY} )
-+  SET(CSMAPI_INCLUDE_DIRS ${CSMAPI_INCLUDE_DIRS} ${CSMAPI_INCLUDE_DIRS}/TSM)
-+ENDIF(CSMAPI_FOUND)
-+MARK_AS_ADVANCED(CSMAPI_INCLUDE_DIRS CSMAPI_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/Findossim.cmake
++++ ossim/ossim/CMakeModules/Findossim.cmake
 @@ -0,0 +1,68 @@
 +#---
 +# File: FindOSSIM.cmake
@@ -2051,101 +733,7 @@ Forwarded: not-needed
 +
 +MARK_AS_ADVANCED(OSSIM_INCLUDES OSSIM_INCLUDE_DIR OSSIM_LIBRARY)
 --- /dev/null
-+++ b/ossim/CMakeModules/FindossimPlanet.cmake
-@@ -0,0 +1,44 @@
-+# - Find ossimPlanet library
-+# Find the native ossimPlanet includes and library
-+# This module defines
-+#  OSSIMPLANET_INCLUDE_DIR, where to find tiff.h, etc.
-+#  OSSIMPLANET_LIBRARIES, libraries to link against to use OSSIM.
-+#  OSSIMPLANET_FOUND, If false, do not try to use OSSIM.
-+# also defined, but not for general use are
-+#  OSSIMPLANET_LIBRARY, where to find the OSSIM library.
-+SET(CMAKE_FIND_FRAMEWORK "LAST")
-+FIND_PATH(OSSIMPLANET_INCLUDE_DIR ossimPlanet/ossimPlanetExport.h ossimPlanetExport.h
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/ossimPlanet/include
-+		$ENV{OSSIM_DEV_HOME}/ossimPlanet/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}/include
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/ossimPlanet
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		include
-+)
-+
-+SET(OSSIMPLANET_NAMES ${OSSIMPLANET_NAMES} ossimPlanet )
-+FIND_LIBRARY(OSSIMPLANET_LIBRARY NAMES ${OSSIMPLANET_NAMES}
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/ossimPlanet/lib
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/ossimPlanet/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		Frameworks
-+)
-+
-+# handle the QUIETLY and REQUIRED arguments and set OSSIMPLANET_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSSIMPLANET  DEFAULT_MSG  OSSIMPLANET_LIBRARY  OSSIMPLANET_INCLUDE_DIR)
-+
-+IF(OSSIMPLANET_FOUND)
-+  SET( OSSIMPLANET_LIBRARIES ${OSSIMPLANET_LIBRARY} )
-+ENDIF(OSSIMPLANET_FOUND)
-+
-+MARK_AS_ADVANCED(OSSIMPLANET_INCLUDE_DIR OSSIMPLANET_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/FindossimPredator.cmake
-@@ -0,0 +1,44 @@
-+# - Find ossimPredator library
-+# Find the native ossimPredator includes and library
-+# This module defines
-+#  OSSIMPREDATOR_INCLUDE_DIR, where to find tiff.h, etc.
-+#  OSSIMPREDATOR_LIBRARIES, libraries to link against to use ossimPredator.
-+#  OSSIMPREDATOR_FOUND, If false, do not try to use ossimPredator.
-+# also defined, but not for general use are
-+#  OSSIMPREDATOR_LIBRARY, where to find the ossimPredator library.
-+SET(CMAKE_FIND_FRAMEWORK "LAST")
-+FIND_PATH(OSSIMPREDATOR_INCLUDE_DIR ossimPredator/ossimPredatorExport.h
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/ossimPredator/include
-+		$ENV{OSSIM_DEV_HOME}/ossimPredator/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}/include
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/ossim
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		include
-+)
-+SET(OSSIMPREDATOR_NAMES ${OSSIMPREDATOR_NAMES} ossimPredator )
-+FIND_LIBRARY(OSSIMPREDATOR_LIBRARY NAMES ${OSSIMPREDATOR_NAMES}
-+	HINTS 
-+		$ENV{OSSIM_DEV_HOME}/ossimPredator/lib
-+	PATHS
-+		$ENV{OSSIM_DEV_HOME}/ossimPredator/lib
-+		$ENV{OSSIM_INSTALL_PREFIX}
-+    	PATH_SUFFIXES 
-+		lib
-+		Frameworks
-+)
-+
-+# handle the QUIETLY and REQUIRED arguments and set OSSIMPREDATOR_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSSIMPREDATOR  DEFAULT_MSG  OSSIMPREDATOR_LIBRARY  OSSIMPREDATOR_INCLUDE_DIR)
-+
-+IF(OSSIMPREDATOR_FOUND)
-+  SET( OSSIMPREDATOR_LIBRARIES ${OSSIMPREDATOR_LIBRARY} )
-+  SET( OSSIMPREDATOR_INCLUDES ${OSSIMPREDATOR_INCLUDE_DIR} )
-+ENDIF(OSSIMPREDATOR_FOUND)
-+
-+MARK_AS_ADVANCED(OSSIMPREDATOR_INCLUDE_DIR OSSIMPREDATOR_LIBRARY)
---- /dev/null
-+++ b/ossim/CMakeModules/OssimCPack.cmake
++++ ossim/ossim/CMakeModules/OssimCPack.cmake
 @@ -0,0 +1,156 @@
 +# This script sets up packaging targets for each "COMPONENT" as specified in INSTALL commands
 +#
@@ -2304,7 +892,7 @@ Forwarded: not-needed
 +    GENERATE_PACKAGING_TARGET(${package})
 +ENDFOREACH()
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimCPackConfig.cmake.in
++++ ossim/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
@@ -2380,8 +968,8 @@ Forwarded: not-needed
 +SET(CPACK_RPM_PACKAGE_DEBUG "1")
 +SET(CPACK_OSX_PACKAGE_VERSION "10.6")
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimCommonVariables.cmake
-@@ -0,0 +1,233 @@
++++ ossim/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
@@ -2423,9 +1011,12 @@ Forwarded: not-needed
 +
 +         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")
++               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")
++               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")
@@ -2461,6 +1052,27 @@ Forwarded: not-needed
 +   # 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
@@ -2600,6 +1212,7 @@ Forwarded: not-needed
 +   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)
@@ -2616,7 +1229,7 @@ Forwarded: not-needed
 +OSSIM_ADD_COMMON_SETTINGS()
 +
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimDetermineCompiler.cmake
++++ ossim/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.
@@ -2696,7 +1309,7 @@ Forwarded: not-needed
 +    ENDIF(_TRY_RESULT)
 +ENDIF(MSVC80)
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimQt4Macros.cmake
++++ ossim/ossim/CMakeModules/OssimQt4Macros.cmake
 @@ -0,0 +1,24 @@
 +include(Qt4Macros)
 +MACRO (OSSIM_QT4_WRAP_UI outfiles)
@@ -2723,7 +1336,7 @@ Forwarded: not-needed
 +
 +ENDMACRO (OSSIM_QT4_WRAP_UI)
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimQt5Macros.cmake
++++ ossim/ossim/CMakeModules/OssimQt5Macros.cmake
 @@ -0,0 +1,19 @@
 +include(Qt5Macros)
 +MACRO (OSSIM_QT_WRAP_UI outfiles)
@@ -2745,8 +1358,8 @@ Forwarded: not-needed
 +
 +ENDMACRO (OSSIM_QT_WRAP_UI)
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimUtilities.cmake
-@@ -0,0 +1,383 @@
++++ ossim/ossim/CMakeModules/OssimUtilities.cmake
+@@ -0,0 +1,359 @@
 +#################################################################################
 +# This was taken from the http://www.cmake.org/Wiki/CMakeMacroParseArguments
 +#################################################################################
@@ -2802,38 +1415,7 @@ Forwarded: not-needed
 +#      MACRO FOR GETTING THE DATE AND TIME INFORMATION
 +#################################################################################
 +MACRO (TODAYS_DATE RESULT)
-+
-+   set(TEMP_DATE "")
-+  
-+   IF (CMAKE_HOST_WIN32)
-+      IF(NOT EXISTS "${CMAKE_BINARY_DIR}/get_date.cmd")
-+
-+      ###### OUTPUT DATE ROUTINE #####
-+      write_file("${CMAKE_BINARY_DIR}/get_date.cmd" "@echo off
-+      @REM Seamonkey's quick date batch (MMDDYYYY format)
-+      @REM Setups %date variable
-+      @REM First parses month, day, and year into mm , dd, yyyy formats and then combines to be MMDDYYYY
-+
-+      @FOR /F \"TOKENS=1* DELIMS= \" %%A IN ('DATE/T') DO SET CDATE=%%B
-+      @FOR /F \"TOKENS=1,2 eol=/ DELIMS=/ \" %%A IN ('DATE/T') DO SET mm=%%B
-+      @FOR /F \"TOKENS=1,2 DELIMS=/ eol=/\" %%A IN ('echo %CDATE%') DO SET dd=%%B
-+      @FOR /F \"TOKENS=2,3 DELIMS=/ \" %%A IN ('echo %CDATE%') DO SET yyyy=%%B
-+      @SET CURRENT_DATE=%yyyy%%mm%%dd%
-+      @echo on
-+      @echo %CURRENT_DATE%")
-+
-+      ENDIF(NOT EXISTS "${CMAKE_BINARY_DIR}/get_date.cmd")
-+ 
-+      EXECUTE_PROCESS(COMMAND "cmake" "-E" "comspec" "${CMAKE_BINARY_DIR}/get_date.cmd"  OUTPUT_VARIABLE ${RESULT})
-+      string(REGEX REPLACE "\n|\r" "" ${RESULT} ${${RESULT}})
-+   ELSEIF(CMAKE_HOST_UNIX)
-+      EXECUTE_PROCESS(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT})
-+      string(REGEX REPLACE "(..)/(..)/..(..).*" "\\3\\2\\1" ${RESULT} ${${RESULT}})
-+      string(REGEX REPLACE "\n|\r" "" ${RESULT} ${${RESULT}})
-+   ELSE (WIN32)
-+      MESSAGE(SEND_ERROR "date not implemented")
-+      SET(${RESULT} 000000)
-+   ENDIF (CMAKE_HOST_WIN32)
++  string(TIMESTAMP  ${RESULT} "%Y%m%d" UTC)
 +ENDMACRO (TODAYS_DATE)
 +
 +#################################################################################
@@ -2968,6 +1550,13 @@ Forwarded: not-needed
 +    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 "../")    
@@ -3045,12 +1634,12 @@ Forwarded: not-needed
 +          SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES 
 +                             FRAMEWORK TRUE
 +                             BUILD_WITH_INSTALL_RPATH ON 
-+                             INSTALL_NAME_DIR @executable_path/../Frameworks)
++                             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 @executable_path/../lib)
++                             INSTALL_NAME_DIR @rpath/lib)
 +        ENDIF(BUILD_OSSIM_FRAMEWORKS)
 +      ELSE(BUILD_SHARED_LIBRARY)
 +          SET_TARGET_PROPERTIES(${LINK_NAME} PROPERTIES 
@@ -3131,16 +1720,16 @@ Forwarded: not-needed
 +ENDMACRO(OSSIM_ADD_COMMON_MAKE_UNINSTALL)
 +
 --- /dev/null
-+++ b/ossim/CMakeModules/OssimVersion.cmake
++++ ossim/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 "16")
++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
++++ ossim/ossim/CMakeModules/Qt5Macros.cmake
 @@ -0,0 +1,83 @@
 +# This file is included by FindQt5.cmake, don't include it directly.
 +
@@ -3226,7 +1815,7 @@ Forwarded: not-needed
 +
 +
 --- /dev/null
-+++ b/ossim/CMakeModules/cmake_uninstall.cmake.in
++++ ossim/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\"")
@@ -3250,36 +1839,3 @@ Forwarded: not-needed
 +        MESSAGE(STATUS "File \"${file}\" does not exist.")
 +    ENDIF()
 +ENDFOREACH()
---- a/ossim/src/ossim/CMakeLists.txt
-+++ b/ossim/src/ossim/CMakeLists.txt
-@@ -1,4 +1,5 @@
- SET(LIB_NAME ossim)
-+SET(LIB_NAME_STATIC ossimstatic)
- 
- ########################################### BEGIN: GRAB SOURCE FILES ##########################################
- FILE(GLOB ossim_dll_main_SRCS RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/dll_main/*.cpp")
-@@ -108,13 +109,23 @@ ENDIF(APPLE)
- #################################### SETUP the required link parameters using the Ossim macro ####################################
- OSSIM_LINK_LIBRARY(${LIB_NAME} 
-                    COMPONENT_NAME ossim 
--                   TYPE ${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC}
-+                   TYPE "SHARED"
-                    LIBRARIES ${ossimDependentLibs}
-                    HEADERS "${OSSIM_HEADER_FILES}" 
-                    PUBLIC_HEADERS "${ossim_HDRS}"
-                    SOURCE_FILES "${ossim_SRCS}"
-                    INSTALL_LIB VERSION_SYMLINKS)
- 
-+OSSIM_LINK_LIBRARY(${LIB_NAME_STATIC} 
-+                   COMPONENT_NAME ossim 
-+                   TYPE "STATIC"
-+                   LIBRARIES ${ossimDependentLibs}
-+                   HEADERS "${OSSIM_HEADER_FILES}" 
-+                   PUBLIC_HEADERS "${ossim_HDRS}"
-+                   SOURCE_FILES "${ossim_SRCS}"
-+                   INSTALL_LIB VERSION_SYMLINKS)
-+SET_TARGET_PROPERTIES(${LIB_NAME_STATIC}  PROPERTIES OUTPUT_NAME ossim)
-+
- # The install headers was duplicating ossimVersion.h and ossimConfig.h in "install_prefix/include".
- # INSTALL_HEADERS)
- 

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