[Git][debian-gis-team/pktools][upstream] New upstream version 2.6.7.6+ds
Bas Couwenberg
gitlab at salsa.debian.org
Sun Nov 25 18:10:42 GMT 2018
Bas Couwenberg pushed to branch upstream at Debian GIS Project / pktools
Commits:
956dca76 by Bas Couwenberg at 2018-11-25T17:54:36Z
New upstream version 2.6.7.6+ds
- - - - -
8 changed files:
- CMakeLists.txt
- − CMakeLists.txt.orig
- − gdal-c++11.patch
- src/CMakeLists.txt
- src/apps/pkfilter.cc
- src/apps/pkfilterdem.cc
- src/apps/pkreclass.cc
- src/apps/pkstatprofile.cc
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -36,7 +36,7 @@ set (PROJECT_SOURCE_DIR src)
# The version number.
set (PKTOOLS_VERSION_MAJOR 2)
set (PKTOOLS_VERSION_MINOR 6)
-set (PKTOOLS_VERSION_PATCH 7.5)
+set (PKTOOLS_VERSION_PATCH 7.6)
set (PKTOOLS_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
set (PKTOOLS_PACKAGE_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
set (PKTOOLS_PACKAGE_STRING "PKTOOLS ${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
@@ -81,11 +81,12 @@ set(PKTOOLS_FILECLASSES_LIB_NAME fileClasses)
set(PKTOOLS_IMAGECLASSES_LIB_NAME imageClasses)
set(PKTOOLS_LASCLASSES_LIB_NAME lasClasses)
-option (BUILD_SHARED_LIBS "Build with shared library" OFF)
+option(BUILD_SHARED_LIBS "Build with shared library" OFF)
set(BUILD_WITH_LIBLAS FALSE CACHE BOOL "Choose if pktools is to be built with liblas")
set(BUILD_WITH_FANN FALSE CACHE BOOL "Choose if pktools is to be built with fann")
#set(BUILD_WITH_NLOPT FALSE CACHE BOOL "Choose if pktools is to be built with nlopt")
set(PKTOOLS_WITH_UTILITIES TRUE CACHE BOOL "Choose if pktools utilities should be built")
+option(INSTALL_LIBRARY_DIR "Install path for libraries" ${PROJECT_LIBRARY_DIR})
set(GSL_INCLUDE_DIR /usr/include CACHE PATH "Include PATH for GSL")
set(GSL_LIB_PATH /usr/lib CACHE PATH "Library PATH for GSL")
@@ -364,7 +365,8 @@ endif()
#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
#test
install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+install (FILES "pktools.pc" DESTINATION ${INSTALL_LIBRARY_DIR}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
if (PKTOOLS_WITH_UTILITIES)
install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
=====================================
CMakeLists.txt.orig deleted
=====================================
@@ -1,408 +0,0 @@
-###############################################################################
-#
-# CMake build scripts for PKTOOLS
-#
-#
-# History
-# 2010/12/14 - Created by Peter Bunting for SPDLib
-# 2012/02/07 - Edited by Peter Bunting for PKTOOLS
-# 2014/11/22 - Edited by Peter Bunting for pktools
-# 2015/12/10 - Edited by Pieter Kempeneers and Kris Vanhoof
-# Change log
-# Find package lib
-# Boost: disable auto linking: add_definitions("-DBOOST_ALL_NO_LIB")
-# add cmake env variable Boost_COMPILER -vc110
-# FANN: create library CMake: add ADD_DEFINITIONS(-DFANN_DLL_EXPORTS)
-# GDAL: disabled macro for Visual Studio 2015
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-# define snprintf _snprintf
-#endif
-#set CMAKE_INSTALL_PREFIX to C:/OSGeo4W64;C:/Users/kempenep/Downloads/FANN-2.2.0-Source/FANN-2.2.0-Source/install;C:/Users/kempenep/Downloads/armadillo-6.200.4/install;C:\Users\kempenep\Downloads\nlopt-2.4.2-dll64
-#
-###############################################################################
-cmake_minimum_required(VERSION 2.6.0)
-#cmake_minimum_required(VERSION 2.8)
-###############################################################################
-# Set Project name and version
-project (PKTOOLS)
-
-set (PROJECT_BINARY_DIR bin)
-set (PROJECT_LIBRARY_DIR lib)
-set (PROJECT_INCLUDE_DIR include/pktools)
-set (PROJECT_DOC_DIR doc)
-set (PROJECT_SOURCE_DIR src)
-
-# The version number.
-set (PKTOOLS_VERSION_MAJOR 2)
-set (PKTOOLS_VERSION_MINOR 6)
-set (PKTOOLS_VERSION_PATCH 7.4)
-set (PKTOOLS_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
-set (PKTOOLS_PACKAGE_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
-set (PKTOOLS_PACKAGE_STRING "PKTOOLS ${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
-set (PKTOOLS_PACKAGE_BUGREPORT "kempenep at gmail.com")
-set (PKTOOLS_PACKAGE "pktools")
-set (PKTOOLS_COPYRIGHT_YEAR 2016)
-
-set (PKTOOLS_BASE_VERSION_MAJOR 1)
-set (PKTOOLS_BASE_VERSION_MINOR 6)
-set (PKTOOLS_BASE_VERSION_PATCH 1)
-set (PKTOOLS_BASE_VERSION "${PKTOOLS_BASE_VERSION_MAJOR}.${PKTOOLS_BASE_VERSION_MINOR}.${PKTOOLS_BASE_VERSION_PATCH}")
-set (PKTOOLS_BASE_SOVERSION 1)
-
-set (PKTOOLS_ALGORITHMS_VERSION_MAJOR 1)
-set (PKTOOLS_ALGORITHMS_VERSION_MINOR 6)
-set (PKTOOLS_ALGORITHMS_VERSION_PATCH 1)
-set (PKTOOLS_ALGORITHMS_VERSION "${PKTOOLS_ALGORITHMS_VERSION_MAJOR}.${PKTOOLS_ALGORITHMS_VERSION_MINOR}.${PKTOOLS_ALGORITHMS_VERSION_PATCH}")
-set (PKTOOLS_ALGORITHMS_SOVERSION 1)
-
-set (PKTOOLS_FILECLASSES_VERSION_MAJOR 1)
-set (PKTOOLS_FILECLASSES_VERSION_MINOR 6)
-set (PKTOOLS_FILECLASSES_VERSION_PATCH 1)
-set (PKTOOLS_FILECLASSES_VERSION "${PKTOOLS_FILECLASSES_VERSION_MAJOR}.${PKTOOLS_FILECLASSES_VERSION_MINOR}.${PKTOOLS_FILECLASSES_VERSION_PATCH}")
-set (PKTOOLS_FILECLASSES_SOVERSION 1)
-
-set (PKTOOLS_IMAGECLASSES_VERSION_MAJOR 1)
-set (PKTOOLS_IMAGECLASSES_VERSION_MINOR 6)
-set (PKTOOLS_IMAGECLASSES_VERSION_PATCH 1)
-set (PKTOOLS_IMAGECLASSES_VERSION "${PKTOOLS_IMAGECLASSES_VERSION_MAJOR}.${PKTOOLS_IMAGECLASSES_VERSION_MINOR}.${PKTOOLS_IMAGECLASSES_VERSION_PATCH}")
-set (PKTOOLS_IMAGECLASSES_SOVERSION 1)
-
-set (PKTOOLS_LASCLASSES_VERSION_MAJOR 1)
-set (PKTOOLS_LASCLASSES_VERSION_MINOR 6)
-set (PKTOOLS_LASCLASSES_VERSION_PATCH 1)
-set (PKTOOLS_LASCLASSES_VERSION "${PKTOOLS_LASCLASSES_VERSION_MAJOR}.${PKTOOLS_LASCLASSES_VERSION_MINOR}.${PKTOOLS_LASCLASSES_VERSION_PATCH}")
-set (PKTOOLS_LASCLASSES_SOVERSION 1)
-
-# Name of C++ library
-set(PKTOOLS_BASE_LIB_NAME base)
-set(PKTOOLS_ALGORITHMS_LIB_NAME algorithms)
-set(PKTOOLS_FILECLASSES_LIB_NAME fileClasses)
-set(PKTOOLS_IMAGECLASSES_LIB_NAME imageClasses)
-set(PKTOOLS_LASCLASSES_LIB_NAME lasClasses)
-
-option (BUILD_SHARED_LIBS "Build with shared library" OFF)
-set(BUILD_WITH_LIBLAS FALSE CACHE BOOL "Choose if pktools is to be built with liblas")
-set(BUILD_WITH_FANN FALSE CACHE BOOL "Choose if pktools is to be built with fann")
-#set(BUILD_WITH_NLOPT FALSE CACHE BOOL "Choose if pktools is to be built with nlopt")
-set(PKTOOLS_WITH_UTILITIES TRUE CACHE BOOL "Choose if pktools utilities should be built")
-
-set(GSL_INCLUDE_DIR /usr/include CACHE PATH "Include PATH for GSL")
-set(GSL_LIB_PATH /usr/lib CACHE PATH "Library PATH for GSL")
-
-###############################################################################
-
-###############################################################################
-# CMake settings
-# cmake_minimum_required(VERSION 2.6.0)
-
-IF(NOT CMAKE_BUILD_TYPE)
- #SET(CMAKE_BUILD_TYPE "DEBUG")
- SET(CMAKE_BUILD_TYPE "RELEASE")
- #SET(CMAKE_BUILD_TYPE "RELWITHDEBINFO")
- #SET(CMAKE_BUILD_TYPE "MINSIZEREL")
-ENDIF()
-
-set(CMAKE_COLOR_MAKEFILE ON)
-
-# Allow advanced users to generate Makefiles printing detailed commands
-mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
-
-# Path to additional CMake modules
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-###############################################################################
-
-###############################################################################
-# Setup configure file
-configure_file ( "cmake-config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/base/config.h" @ONLY)
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/base")
-add_definitions(-DHAVE_CONFIG_H)
-###############################################################################
-
-###############################################################################
-# Documentation
-#file(READ "doc/index.txt" README )
-file(WRITE "README.txt" "${README}")
-###############################################################################
-
-###############################################################################
-# Platform and compiler specific settings
-
-if(WIN32)
- if (MSVC)
- if (MSVC80 OR MSVC90 OR MSVC10)
- add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- add_definitions(-D_CRT_NONSTDC_NO_WARNING)
- add_definitions(-D_SCL_SECURE_NO_WARNINGS)
- endif()
- if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
- string(REGEX REPLACE "/W[0-4]" "/W4"
- CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
- endif()
-
- # Generate dot-user file with user-specific settings for Visual Studio project
- set(MSVC_ENVIRONMENT_PATH "" CACHE STRING
- "Custom PATH for Environment property in Visual Studio project configuration")
- mark_as_advanced(MSVC_ENVIRONMENT_PATH)
- set(VCPROJ_USER_ENVIRONMENT_PATH_DEBUG "${ENVIRONMENT_PATH}")
- mark_as_advanced(VCPROJ_USER_ENVIRONMENT_PATH_DEBUG)
-
- endif()
-
- set(CMAKE_INCLUDE_PATH c:/osgeo4w/include;$ENV{CMAKE_INCLUDE_PATH})
- set(CMAKE_LIBRARY_PATH c:/osgeo4w/lib;$ENV{CMAKE_LIBRARY_PATH})
-else()
- # Recommended C++ compilation flags
- # -Weffc++
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
- set(PKTOOLS_COMMON_CXX_FLAGS
- "-Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wredundant-decls -Wno-long-long")
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
- if (CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
- endif()
-
- elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PKTOOLS_COMMON_CXX_FLAGS}")
- endif()
-endif(WIN32)
-
-if (APPLE)
- set(SO_EXT dylib)
- # set(CMAKE_FIND_FRAMEWORK "LAST")
-elseif(WIN32)
- set(SO_EXT dll)
-else()
- set(SO_EXT so)
-endif(APPLE)
-###############################################################################
-
-###############################################################################
-# Check the required libraries are present
-
-#include_directories(${GDAL_INCLUDE_DIR})
-#if (MSVC)
-# set(GDAL_LIBRARIES -LIBPATH:${GDAL_LIB_PATH} gdal_i.lib)
-#else()
-# set(GDAL_LIBRARIES -L${GDAL_LIB_PATH} -lgdal)
-#endif(MSVC)
-
-find_package(GDAL 1.10 REQUIRED)
-if(GDAL_FOUND)
- include_directories(${GDAL_INCLUDE_DIRS})
-endif()
-
-find_package(GSL REQUIRED)
-if(GSL_FOUND)
- include_directories(${GSL_INCLUDE_DIRS})
- add_definitions(-DGSL_DLL)
-endif()
-
-find_package(Armadillo REQUIRED)
-if(ARMADILLO_FOUND)
- include_directories(${ARMADILLO_INCLUDE_DIRS})
-endif()
-
-if (BUILD_WITH_LIBLAS)
- find_package(LIBLAS)
- if(LIBLAS_FOUND)
- include_directories(${LIBLAS_INCLUDE_DIRS})
- endif()
- set(Boost_DEBUG 0)
- find_package(Boost COMPONENTS filesystem system)
- if(Boost_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
- add_definitions("-DBOOST_ALL_NO_LIB")
- endif()
-# include_directories(${BOOST_INCLUDE_DIR})
-# if (MSVC)
-# set(BOOST_LIBRARIES -LIBPATH:${BOOST_LIB_PATH} libboost_filesystem-vc100-mt-1_56.lib libboost_system-vc100-mt-1_56.lib)
-# else()
-# set(BOOST_LIBRARIES -L${BOOST_LIB_PATH} -lboost_filesystem -lboost_system)
-# endif(MSVC)
-endif(BUILD_WITH_LIBLAS)
-
-if (BUILD_WITH_FANN)
- find_package(FANN)
- if(FANN_FOUND)
- include_directories(${FANN_INCLUDE_DIRS})
- add_definitions(-DFANN_DLL)
- endif()
-endif(BUILD_WITH_FANN)
-
-# if (BUILD_WITH_NLOPT)
-# find_package(NLOPT)
-# if(NLOPT_FOUND)
-# include_directories(${NLOPT_INCLUDE_DIRS})
-# add_definitions(-DNLOPT_DLL)
-# endif()
-# endif(BUILD_WITH_NLOPT)
-###############################################################################
-
-###############################################################################
-# Build libraries
-include_directories("${PROJECT_SOURCE_DIR}")
-add_subdirectory ("${PROJECT_SOURCE_DIR}")
-###############################################################################
-
-###############################################################################
-# Build executables
-
-#configure_file ( "cmake-config.in" "${PROJECT_BINARY_DIR}/pktools-config" @ONLY )
-#test
-configure_file ( "cmake-config.in" "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" @ONLY )
-configure_file ( "cmake.pc.in" "pktools.pc" @ONLY)
-
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-set(PKLIBS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${GDAL_LIBRARIES} ${GSL_LIBRARIES} ${Boost_LIBRARIES})
-
-set(PKUTILITIES
- pkinfo
- pkcrop
- pkdiff
- pkgetmask
- pksetmask
- pkcreatect
- pkdumpimg
- pkdumpogr
- pksieve
- pkstat
- pkstatascii
- pkstatogr
- pkstatprofile
- pkegcs
- pkextractimg
- pkextractogr
- pkfillnodata
- pkfilter
- pkfilterdem
- pkfilterascii
- pkdsm2shadow
- pkcomposite
- pkpolygonize
- pkascii2img
- pksvm
- pksvmogr
- pkfssvm
- pkoptsvm
- pkascii2ogr
- pkreclass
- pkreclassogr
- pkkalman
- )
-
-set(PKLASUTILITIES
- pklas2img
-)
-
-set(PKFANNUTILITIES
- pkann
- pkannogr
- pkfsann
- pkregann
-)
-
-# set(PKNLOPTUTILITIES
-# pkoptsvm
-# )
-
-if (PKTOOLS_WITH_UTILITIES)
- foreach(UTILITY ${PKUTILITIES})
- add_executable(${UTILITY} src/apps/${UTILITY}.cc)
- target_link_libraries(${UTILITY} ${PKLIBS})
- set_target_properties(${UTILITY} PROPERTIES FOLDER utilities)
- endforeach()
-
- if (BUILD_WITH_LIBLAS)
- set(PKLIBS ${PKLIBS} ${PKTOOLS_LASCLASSES_LIB_NAME})
- foreach(PKLASUTILITY ${PKLASUTILITIES})
- add_executable(${PKLASUTILITY} src/apps/${PKLASUTILITY}.cc)
- target_link_libraries (${PKLASUTILITY}
- ${PKLIBS} ${LIBLAS_LIBRARIES})
- set_target_properties(${PKLASUTILITY} PROPERTIES FOLDER utilities)
- endforeach()
- endif()
- if (BUILD_WITH_FANN)
- set(PKLIBS ${PKLIBS} ${FANN_LIBRARIES})
- foreach(PKFANNUTILITY ${PKFANNUTILITIES})
- add_executable(${PKFANNUTILITY} src/apps/${PKFANNUTILITY}.cc)
- # message(${PKLIBS})
- target_link_libraries (${PKFANNUTILITY} ${PKLIBS})
- set_target_properties(${PKFANNUTILITY} PROPERTIES FOLDER utilities)
- endforeach()
- endif()
- # if (BUILD_WITH_NLOPT)
- # set(PKLIBS ${PKLIBS} ${NLOPT_LIBRARIES})
- # foreach(PKNLOPTUTILITY ${PKNLOPTUTILITIES})
- # add_executable(${PKNLOPTUTILITY} src/apps/${PKNLOPTUTILITY}.cc)
- # message(${PKLIBS})
- # target_link_libraries (${PKNLOPTUTILITY} ${PKLIBS})
- # set_target_properties(${PKNLOPTUTILITY} PROPERTIES FOLDER utilities)
- # endforeach()
- # endif()
- # add_custom_target(utilities DEPENDS ${PKUTILITIES} ${PKLASUTILITIES} ${PKFANNUTILITIES} ${PKNLOPTUTILITIES})
- add_custom_target(utilities DEPENDS ${PKUTILITIES} ${PKLASUTILITIES} ${PKFANNUTILITIES})
- set_target_properties(utilities PROPERTIES FOLDER
- phony)
-
-endif()
-
-
-###############################################################################
-
-###############################################################################
-# Installation
-#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-#install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-#test
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-
-if (PKTOOLS_WITH_UTILITIES)
- install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- if (BUILD_WITH_LIBLAS)
- install (TARGETS ${PKLASUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif(BUILD_WITH_LIBLAS)
- if (BUILD_WITH_FANN)
- install (TARGETS ${PKFANNUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif(BUILD_WITH_FANN)
- # if (BUILD_WITH_NLOPT)
- # install (TARGETS ${PKNLOPTUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- # endif(BUILD_WITH_NLOPT)
-endif(PKTOOLS_WITH_UTILITIES)
-
-###############################################################################
-
-###############################################################################
-# Create Distribution
-SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
-SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-
-set(CPACK_SOURCE_PACKAGE_FILE_NAME
- "${CMAKE_PROJECT_NAME}-${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
-
-# Set files to ignore
-list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".zip")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".svn")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".git")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "README")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "HOWTORELEASE.txt")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "CPackConfig.cmake")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "schemas")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/;~$;${CPACK_SOURCE_IGNORE_FILES}")
-
-include(CPack)
-
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-###############################################################################
=====================================
gdal-c++11.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Use C++11 for compatibility with GDAL 2.3.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ else()
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
- if (CMAKE_COMPILER_IS_GNUCXX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif()
-
- elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
=====================================
src/CMakeLists.txt
=====================================
@@ -148,7 +148,7 @@ endif(BUILD_WITH_LIBLAS)
###############################################################################
# Installation
-install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION lib)
+install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME} ${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION ${INSTALL_LIBRARY_DIR})
install (FILES ${BASE_H} DESTINATION ${PROJECT_INCLUDE_DIR}/base)
install (FILES ${IMGCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/imageclasses)
@@ -156,7 +156,8 @@ install (FILES ${ALGOR_H} DESTINATION ${PROJECT_INCLUDE_DIR}/algorithms)
install (FILES ${FILECLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/fileclasses)
if (BUILD_WITH_LIBLAS)
-install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION lib)
+install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION ${INSTALL_LIBRARY_DIR})
+
install (FILES ${LASCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/lasclasses)
endif(BUILD_WITH_LIBLAS)
###############################################################################
=====================================
src/apps/pkfilter.cc
=====================================
@@ -211,7 +211,7 @@ pkfilter -i lena.tif -o sobelx.tif -f sobelx -dx 5 -dy 5
| interp | interp | std::string | akima |type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html) |
| ot | otype | std::string | |Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image |
| of | oformat | std::string | GTiff |Output image format (see also gdal_translate).|
- | ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table |
+ | ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table |
| circ | circular | bool | false |circular disc kernel for dilation and erosion |
Usage: pkfilter -i input -o output [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]
@@ -256,7 +256,7 @@ int main(int argc,char **argv) {
Optionpk<std::string> interpolationType_opt("interp", "interp", "type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image","");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see also gdal_translate).","GTiff");
- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionpk<string> option_opt("co", "co", "Creation option for output file. Multiple options can be specified.");
Optionpk<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling). Use value n>1 for downsampling (aggregation)", 1);
Optionpk<string> beta_opt("beta", "beta", "ASCII file with beta for each class transition in Markov Random Field");
=====================================
src/apps/pkfilterdem.cc
=====================================
@@ -61,7 +61,7 @@ The utility pkfilterdem can be used to filter digital elevation models. It is ty
| minchange | minchange | short | 0 |Stop iterations when no more pixels are changed than this threshold. |
| ot | otype | std::string | |Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image |
| of | oformat | std::string | GTiff |Output image format (see also gdal_translate).|
- | ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table |
+ | ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table |
| nodata | nodata | short | |nodata value |
Usage: pkfilterdem -i input.txt -o output
@@ -85,7 +85,7 @@ int main(int argc,char **argv) {
Optionpk<short> minChange_opt("minchange", "minchange", "Stop iterations when no more pixels are changed than this threshold.", 0);
Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image","");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see also gdal_translate).","GTiff");
- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionpk<string> option_opt("co", "co", "Creation option for output file. Multiple options can be specified.");
Optionpk<short> nodata_opt("nodata", "nodata", "nodata value");
Optionpk<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
=====================================
src/apps/pkreclass.cc
=====================================
@@ -43,7 +43,7 @@ along with pktools. If not, see <http://www.gnu.org/licenses/>.
| m | mask | std::string | |Mask image(s) |
| msknodata | msknodata | unsigned short | 1 |Mask value(s) where image has nodata. Use one value for each mask, or multiple values for a single mask. |
| nodata | nodata | int | 0 |nodata value to put in image if not valid (0) |
- | code | code | std::string | |Recode text file (2 colums: from to) |
+ | code | code | std::string | |Recode text file (2 columns: from to) |
| c | class | std::string | |list of classes to reclass (in combination with reclass option) |
| r | reclass | std::string | |list of recoded classes (in combination with class option) |
| ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid) |
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
Optionpk<unsigned short> band_opt("b", "band", "band index(es) to replace (other bands are copied to output)", 0);
Optionpk<string> type_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image", "");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see also gdal_translate).","GTiff");
- Optionpk<string> code_opt("code", "code", "Recode text file (2 colums: from to)");
+ Optionpk<string> code_opt("code", "code", "Recode text file (2 columns: from to)");
Optionpk<string> class_opt("c", "class", "list of classes to reclass (in combination with reclass option)");
Optionpk<string> reclass_opt("r", "reclass", "list of recoded classes (in combination with class option)");
Optionpk<string> fieldname_opt("n", "fname", "field name of the shape file to be replaced", "label");
=====================================
src/apps/pkstatprofile.cc
=====================================
@@ -104,7 +104,7 @@ int main(int argc,char **argv) {
Optionpk<double> nodata_opt("nodata", "nodata", "nodata value(s)");
Optionpk<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image","");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see also gdal_translate)","GTiff");
- Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionpk<string> option_opt("co", "co", "Creation option for output file. Multiple options can be specified.");
// Optionpk<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling). Use value n>1 for downsampling (aggregation)", 1);
Optionpk<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
View it on GitLab: https://salsa.debian.org/debian-gis-team/pktools/commit/956dca76e14d787b247fc825a7c25d9bb01b425d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pktools/commit/956dca76e14d787b247fc825a7c25d9bb01b425d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181125/d9fd3d3f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list