This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ossim.
commit bc8088132183c0f9e5cf885967dbf06f508bad4b Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jun 5 16:42:12 2015 +0200 Refresh cmake patch. --- debian/patches/cmake | 248 +++++++++++++++++---------------------------------- 1 file changed, 83 insertions(+), 165 deletions(-) diff --git a/debian/patches/cmake b/debian/patches/cmake index b328a2c..76d73a8 100644 --- a/debian/patches/cmake +++ b/debian/patches/cmake @@ -1,7 +1,5 @@ -Index: ossim/CMakeModules/FindCPPUNIT.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindCPPUNIT.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindCPPUNIT.cmake @@ -0,0 +1,43 @@ +# - Find CPPUNIT +# Find the native CPPUNIT includes and library @@ -46,10 +44,8 @@ Index: ossim/CMakeModules/FindCPPUNIT.cmake +ENDIF(CPPUNIT_LIBRARY) + +MARK_AS_ADVANCED(CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR ) -Index: ossim/CMakeModules/FindFFTW3.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindFFTW3.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindFFTW3.cmake @@ -0,0 +1,24 @@ +# - Find fftw3 library +# Find the native fftw3 includes and library @@ -75,10 +71,8 @@ Index: ossim/CMakeModules/FindFFTW3.cmake +ENDIF(FFTW3_FOUND) + +MARK_AS_ADVANCED(FFTW3_INCLUDE_DIR FFTW3_LIBRARY) -Index: ossim/CMakeModules/FindFFmpeg.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindFFmpeg.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindFFmpeg.cmake @@ -0,0 +1,190 @@ +# Locate ffmpeg +# This module defines @@ -270,10 +264,8 @@ Index: ossim/CMakeModules/FindFFmpeg.cmake + message( STATUS "FFMPEG_INCLUDE_DIRS = ${FFMPEG_INCLUDE_DIRS}" ) + message( STATUS "FFMPEG_LIBRARIES = ${FFMPEG_LIBRARIES}" ) +endif( NOT FFMPEG_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindFreetype.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindFreetype.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindFreetype.cmake @@ -0,0 +1,95 @@ +# - Locate FreeType library +# This module defines @@ -370,10 +362,8 @@ Index: ossim/CMakeModules/FindFreetype.cmake + + +MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build) -Index: ossim/CMakeModules/FindGEOS.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindGEOS.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindGEOS.cmake @@ -0,0 +1,77 @@ +#--- +# File: FindGEOS.cmake @@ -452,10 +442,8 @@ Index: ossim/CMakeModules/FindGEOS.cmake + message( STATUS "GEOS_INCLUDE_DIR=${GEOS_INCLUDE_DIR}" ) + message( STATUS "GEOS_LIBRARY=${GEOS_LIBRARY}" ) +endif( NOT GEOS_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindGEOTIFF.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindGEOTIFF.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindGEOTIFF.cmake @@ -0,0 +1,24 @@ +# - Find geotiff library +# Find the native geotiff includes and library @@ -481,10 +469,8 @@ Index: ossim/CMakeModules/FindGEOTIFF.cmake +ENDIF(GEOTIFF_FOUND) + +MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIR GEOTIFF_LIBRARY) -Index: ossim/CMakeModules/FindGPSTK.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindGPSTK.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindGPSTK.cmake @@ -0,0 +1,24 @@ +# - Find gpstk library +# Find the native gpstk includes and library @@ -510,10 +496,8 @@ Index: ossim/CMakeModules/FindGPSTK.cmake +ENDIF(GPSTK_FOUND) + +MARK_AS_ADVANCED(GPSTK_INCLUDE_DIR GPSTK_LIBRARY) -Index: ossim/CMakeModules/FindJPEG.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindJPEG.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindJPEG.cmake @@ -0,0 +1,47 @@ +# - Find JPEG +# Find the native JPEG includes and library @@ -562,10 +546,8 @@ Index: ossim/CMakeModules/FindJPEG.cmake +ENDIF(JPEG_LIBRARY) + +MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR ) -Index: ossim/CMakeModules/FindLASzip.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindLASzip.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindLASzip.cmake @@ -0,0 +1,118 @@ +############################################################################### +# @@ -685,10 +667,8 @@ Index: ossim/CMakeModules/FindLASzip.cmake + message( STATUS "LASZIP_LIBRARY=${LASZIP_LIBRARY}" ) + message( STATUS "Found LASzip version: ${LASZIP_VERSION}") +endif( NOT LASZIP_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindLIBLAS.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindLIBLAS.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindLIBLAS.cmake @@ -0,0 +1,103 @@ +#--- +# File: FindLIBLAS.cmake @@ -793,10 +773,8 @@ Index: ossim/CMakeModules/FindLIBLAS.cmake + set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} ) + set(LIBLAS_FOUND "YES") +endif(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR) -Index: ossim/CMakeModules/FindMiniZip.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindMiniZip.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindMiniZip.cmake @@ -0,0 +1,26 @@ +# - Find minizip +# Find the native MINIZIP includes and library @@ -824,10 +802,8 @@ Index: ossim/CMakeModules/FindMiniZip.cmake +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MINIZIP DEFAULT_MSG MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS) -Index: ossim/CMakeModules/FindMrSid.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindMrSid.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindMrSid.cmake @@ -0,0 +1,88 @@ +# - Find MrSid +# Find the native MrSid includes and library @@ -917,10 +893,8 @@ Index: ossim/CMakeModules/FindMrSid.cmake +ENDIF(MRSID_FOUND) + +MARK_AS_ADVANCED(MRSID_LIBRARIES MRSID_INCLUDE_DIR ) -Index: ossim/CMakeModules/FindOMS.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindOMS.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindOMS.cmake @@ -0,0 +1,44 @@ +# - Find ossim library +# Find the native ossim includes and library @@ -966,10 +940,8 @@ Index: ossim/CMakeModules/FindOMS.cmake +ENDIF(OMS_FOUND) + +MARK_AS_ADVANCED(OMS_INCLUDE_DIR OMS_LIBRARY) -Index: ossim/CMakeModules/FindOSG.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindOSG.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindOSG.cmake @@ -0,0 +1,124 @@ +# Locate gdal +# This module defines @@ -1095,10 +1067,8 @@ Index: ossim/CMakeModules/FindOSG.cmake +IF(OSG_LIBRARY AND OSG_INCLUDE_DIR) + SET(OSG_FOUND "YES") +ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR) -Index: ossim/CMakeModules/FindOpenCV.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindOpenCV.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindOpenCV.cmake @@ -0,0 +1,85 @@ +#--- +# File: FindOpenCV.cmake @@ -1185,10 +1155,8 @@ Index: ossim/CMakeModules/FindOpenCV.cmake + 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) -Index: ossim/CMakeModules/FindOpenJPEG.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindOpenJPEG.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindOpenJPEG.cmake @@ -0,0 +1,56 @@ +### +# -*- cmake -*- @@ -1246,10 +1214,8 @@ Index: ossim/CMakeModules/FindOpenJPEG.cmake +ENDIF (OPENJPEG_FOUND) + +MARK_AS_ADVANCED(OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) -Index: ossim/CMakeModules/FindPDAL.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindPDAL.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindPDAL.cmake @@ -0,0 +1,57 @@ +#--- +# File: FindPDAL.cmake @@ -1308,10 +1274,8 @@ Index: ossim/CMakeModules/FindPDAL.cmake + message( STATUS "PDAL_INCLUDE_DIR=${PDAL_INCLUDE_DIR}" ) + message( STATUS "PDAL_LIBRARY=${PDAL_LIBRARY}" ) +endif( NOT PDAL_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindPodofo.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindPodofo.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindPodofo.cmake @@ -0,0 +1,25 @@ +#--- +# File: FindPodofo.cmake @@ -1338,10 +1302,8 @@ Index: ossim/CMakeModules/FindPodofo.cmake +#--- +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PODOFO DEFAULT_MSG PODOFO_LIBRARY PODOFO_INCLUDE_DIR) -Index: ossim/CMakeModules/FindQt5.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindQt5.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindQt5.cmake @@ -0,0 +1,165 @@ +# - Find Qt5 +# This module can be used to find Qt5. @@ -1508,10 +1470,8 @@ Index: ossim/CMakeModules/FindQt5.cmake +SET(QT_FOUND TRUE) +SET(QT5_FOUND TRUE) + -Index: ossim/CMakeModules/FindRapier.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindRapier.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindRapier.cmake @@ -0,0 +1,47 @@ +#--- +# File: FindRapier.cmake @@ -1560,10 +1520,8 @@ Index: ossim/CMakeModules/FindRapier.cmake +if(RAPIER_FOUND) + set( RAPIER_LIBRARIES ${RAPIER_LIBRARY} ) +endif(RAPIER_FOUND) -Index: ossim/CMakeModules/FindRegex.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindRegex.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindRegex.cmake @@ -0,0 +1,64 @@ +# -*- cmake -*- +# @@ -1629,10 +1587,8 @@ Index: ossim/CMakeModules/FindRegex.cmake +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Regex DEFAULT_MSG REGEX_LIBRARIES REGEX_INCLUDE_DIR) + +MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES) -Index: ossim/CMakeModules/FindSQLITE.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindSQLITE.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindSQLITE.cmake @@ -0,0 +1,61 @@ +#--- +# File: FindSQLITE.cmake @@ -1695,10 +1651,8 @@ Index: ossim/CMakeModules/FindSQLITE.cmake + message( STATUS "SQLITE_INCLUDE_DIR=${SQLITE_INCLUDE_DIR}" ) + message( STATUS "SQLITE_LIBRARY=${SQLITE_LIBRARY}" ) +endif( NOT SQLITE_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindStlPort.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindStlPort.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindStlPort.cmake @@ -0,0 +1,26 @@ +#--- +# $Id: FindStlPort.cmake 21190 2012-06-29 19:54:24Z dburken $ @@ -1726,10 +1680,8 @@ Index: ossim/CMakeModules/FindStlPort.cmake +ENDIF(STLPORT_FOUND) + +MARK_AS_ADVANCED(STLPORT_INCLUDE_DIR STLPORT_LIBRARY) -Index: ossim/CMakeModules/FindSubversion.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindSubversion.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindSubversion.cmake @@ -0,0 +1,148 @@ +# - Extract information from a subversion working copy +# The module defines the following variables: @@ -1879,10 +1831,8 @@ Index: ossim/CMakeModules/FindSubversion.cmake +if( NOT SUBVERSION_FIND_QUIETLY ) + message( STATUS "Subversion_VERSION_SVN=${Subversion_VERSION_SVN}" ) +endif( NOT SUBVERSION_FIND_QUIETLY ) -Index: ossim/CMakeModules/FindTIFF.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindTIFF.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindTIFF.cmake @@ -0,0 +1,41 @@ +# - Find TIFF library +# Find the native TIFF includes and library @@ -1925,10 +1875,8 @@ Index: ossim/CMakeModules/FindTIFF.cmake +ENDIF(TIFF_FOUND) + +MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY) -Index: ossim/CMakeModules/FindWMS.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindWMS.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindWMS.cmake @@ -0,0 +1,48 @@ +# - Find wms library +# Find the native wms includes and library @@ -1978,10 +1926,8 @@ Index: ossim/CMakeModules/FindWMS.cmake +ENDIF(WMS_FOUND) + +MARK_AS_ADVANCED(WMS_INCLUDE_DIR WMS_LIBRARY) -Index: ossim/CMakeModules/FindcsmApi.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindcsmApi.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindcsmApi.cmake @@ -0,0 +1,46 @@ +# - Find csmApi library +# Find the native csmApi includes and library @@ -2029,10 +1975,8 @@ Index: ossim/CMakeModules/FindcsmApi.cmake + SET(CSMAPI_INCLUDE_DIRS ${CSMAPI_INCLUDE_DIRS} ${CSMAPI_INCLUDE_DIRS}/TSM) +ENDIF(CSMAPI_FOUND) +MARK_AS_ADVANCED(CSMAPI_INCLUDE_DIRS CSMAPI_LIBRARY) -Index: ossim/CMakeModules/Findossim.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/Findossim.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/Findossim.cmake @@ -0,0 +1,68 @@ +#--- +# File: FindOSSIM.cmake @@ -2102,10 +2046,8 @@ Index: ossim/CMakeModules/Findossim.cmake +endif( NOT OSSIM_FIND_QUIETLY ) + +MARK_AS_ADVANCED(OSSIM_INCLUDES OSSIM_INCLUDE_DIR OSSIM_LIBRARY) -Index: ossim/CMakeModules/FindossimPlanet.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindossimPlanet.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindossimPlanet.cmake @@ -0,0 +1,44 @@ +# - Find ossimPlanet library +# Find the native ossimPlanet includes and library @@ -2151,10 +2093,8 @@ Index: ossim/CMakeModules/FindossimPlanet.cmake +ENDIF(OSSIMPLANET_FOUND) + +MARK_AS_ADVANCED(OSSIMPLANET_INCLUDE_DIR OSSIMPLANET_LIBRARY) -Index: ossim/CMakeModules/FindossimPredator.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/FindossimPredator.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/FindossimPredator.cmake @@ -0,0 +1,44 @@ +# - Find ossimPredator library +# Find the native ossimPredator includes and library @@ -2200,10 +2140,8 @@ Index: ossim/CMakeModules/FindossimPredator.cmake +ENDIF(OSSIMPREDATOR_FOUND) + +MARK_AS_ADVANCED(OSSIMPREDATOR_INCLUDE_DIR OSSIMPREDATOR_LIBRARY) -Index: ossim/CMakeModules/OssimCPack.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimCPack.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimCPack.cmake @@ -0,0 +1,156 @@ +# This script sets up packaging targets for each "COMPONENT" as specified in INSTALL commands +# @@ -2361,10 +2299,8 @@ Index: ossim/CMakeModules/OssimCPack.cmake + SET(OSSIM_CPACK_COMPONENT ${package}) + GENERATE_PACKAGING_TARGET(${package}) +ENDFOREACH() -Index: ossim/CMakeModules/OssimCPackConfig.cmake.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimCPackConfig.cmake.in 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/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 @@ -2439,10 +2375,8 @@ Index: ossim/CMakeModules/OssimCPackConfig.cmake.in +SET(CPACK_STRIP_FILES "ON") +SET(CPACK_RPM_PACKAGE_DEBUG "1") +SET(CPACK_OSX_PACKAGE_VERSION "10.6") -Index: ossim/CMakeModules/OssimCommonVariables.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimCommonVariables.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimCommonVariables.cmake @@ -0,0 +1,233 @@ +################################################################################## +# This currently sets up the options for the WARNING FLAGS for the compiler we are generating for. @@ -2677,10 +2611,8 @@ Index: ossim/CMakeModules/OssimCommonVariables.cmake + +OSSIM_ADD_COMMON_SETTINGS() + -Index: ossim/CMakeModules/OssimDetermineCompiler.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimDetermineCompiler.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/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. @@ -2759,10 +2691,8 @@ Index: ossim/CMakeModules/OssimDetermineCompiler.cmake + #ENDIF(MSVC_IDE) + ENDIF(_TRY_RESULT) +ENDIF(MSVC80) -Index: ossim/CMakeModules/OssimQt4Macros.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimQt4Macros.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimQt4Macros.cmake @@ -0,0 +1,24 @@ +include(Qt4Macros) +MACRO (OSSIM_QT4_WRAP_UI outfiles) @@ -2788,10 +2718,8 @@ Index: ossim/CMakeModules/OssimQt4Macros.cmake + ENDFOREACH (it) + +ENDMACRO (OSSIM_QT4_WRAP_UI) -Index: ossim/CMakeModules/OssimQt5Macros.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimQt5Macros.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimQt5Macros.cmake @@ -0,0 +1,19 @@ +include(Qt5Macros) +MACRO (OSSIM_QT_WRAP_UI outfiles) @@ -2812,10 +2740,8 @@ Index: ossim/CMakeModules/OssimQt5Macros.cmake + ENDFOREACH (it) + +ENDMACRO (OSSIM_QT_WRAP_UI) -Index: ossim/CMakeModules/OssimUtilities.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimUtilities.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimUtilities.cmake @@ -0,0 +1,383 @@ +################################################################################# +# This was taken from the http://www.cmake.org/Wiki/CMakeMacroParseArguments @@ -3200,10 +3126,8 @@ Index: ossim/CMakeModules/OssimUtilities.cmake +# ENDIF(NOT TEST_UNINSTALL) +ENDMACRO(OSSIM_ADD_COMMON_MAKE_UNINSTALL) + -Index: ossim/CMakeModules/OssimVersion.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/OssimVersion.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/OssimVersion.cmake @@ -0,0 +1,6 @@ +SET(OSSIM_MAJOR_VERSION_NUMBER "1") +SET(OSSIM_MINOR_VERSION_NUMBER "8") @@ -3211,10 +3135,8 @@ Index: ossim/CMakeModules/OssimVersion.cmake +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}" ) -Index: ossim/CMakeModules/Qt5Macros.cmake -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/Qt5Macros.cmake 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/CMakeModules/Qt5Macros.cmake @@ -0,0 +1,83 @@ +# This file is included by FindQt5.cmake, don't include it directly. + @@ -3299,10 +3221,8 @@ Index: ossim/CMakeModules/Qt5Macros.cmake +ENDMACRO (QT5_CREATE_MOC_COMMAND) + + -Index: ossim/CMakeModules/cmake_uninstall.cmake.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ossim/CMakeModules/cmake_uninstall.cmake.in 2014-03-06 16:11:51.000000000 +0100 +--- /dev/null ++++ b/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\"") @@ -3326,17 +3246,15 @@ Index: ossim/CMakeModules/cmake_uninstall.cmake.in + MESSAGE(STATUS "File \"${file}\" does not exist.") + ENDIF() +ENDFOREACH() -Index: ossim/src/ossim/CMakeLists.txt -=================================================================== ---- ossim.orig/src/ossim/CMakeLists.txt 2014-03-06 16:11:51.000000000 +0100 -+++ ossim/src/ossim/CMakeLists.txt 2014-03-06 16:14:01.000000000 +0100 +--- a/src/ossim/CMakeLists.txt ++++ b/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 @@ +@@ -108,13 +109,23 @@ ENDIF(APPLE) #################################### SETUP the required link parameters using the Ossim macro #################################### OSSIM_LINK_LIBRARY(${LIB_NAME} COMPONENT_NAME ossim -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel