Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
.gitignore
View file @ 5df4a86d
......@@ -64,6 +64,11 @@ ipch/
.idea
*.iml
#
# Vim backup
#
*.*~
#
# doxygen cruft
#
......
CMakeLists.txt
View file @ 5df4a86d
......@@ -28,14 +28,14 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
# the next line is the ONLY place in the entire pdal system where
# the version info is hard-coded
set(PDAL_VERSION_STRING "1.7.1" CACHE STRING "PDAL version" FORCE)
set(PDAL_VERSION_STRING "1.7.2" CACHE STRING "PDAL version" FORCE)
DISSECT_VERSION()
GET_OS_INFO()
SET_INSTALL_DIRS()
set(PDAL_API_VERSION "6")
set(PDAL_BUILD_VERSION "7.0.1")
set(PDAL_BUILD_VERSION "7.0.2")
# Name of C++ library
......@@ -263,7 +263,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
${LASZIP_INCLUDE_DIR}
)
target_link_libraries(${PDAL_BASE_LIB_NAME}
PUBLIC
PRIVATE
${CMAKE_THREAD_LIBS_INIT}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
......@@ -275,12 +275,10 @@ target_link_libraries(${PDAL_BASE_LIB_NAME}
${ZSTD_STATIC_LIB}
${CURL_LIBRARIES}
${WINSOCK_LIBRARY}
PRIVATE
${PDAL_REEXPORT}
${PDAL_UTIL_LIB_NAME}
${PDAL_ARBITER_LIB_NAME}
${PDAL_KAZHDAN_LIB_NAME}
${JSON_CPP_LINK_TYPE}
${PDAL_JSONCPP_LIB_NAME}
INTERFACE
${PDAL_LIBDIR}
......
CONTRIBUTING.md
View file @ 5df4a86d
......@@ -17,7 +17,7 @@ We use Github's [pull requests](https://help.github.com/articles/using-pull-requ
* Check for unnecessary whitespace with `git diff --check` before committing.
* Make sure your commit messages are in the [proper format](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
* Make sure you have added the necessary tests for your changes.
* [Run _all_ the tests](http://www.pdal.io/development/testing.html) to assure nothing else was accidentally broken.
* [Run _all_ the tests](http://pdal.io/development/testing.html) to assure nothing else was accidentally broken.
## Submitting Changes
......@@ -35,7 +35,7 @@ Fixes #123.
## Additional Resources
* [PDAL's coding conventions](http://www.pdal.io/development/conventions.html)
* [PDAL's coding conventions](http://pdal.io/development/conventions.html)
* [General GitHub documentation](http://help.github.com/)
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
* #pdal IRC channel on freenode.org
......
CPackConfig.cmake deleted 100644 → 0
View file @ 64ca670f
# This file will be configured to contain variables for CPack. These variables
# should be set in the CMake list file of the project before CPack module is
# included. The list of available CPACK_xxx variables and their associated
# documentation may be obtained using
# cpack --help-variable-list
#
# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME)
# and some are specific to a generator
# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
# usually begin with CPACK_<GENNAME>_xxxx.
SET(CPACK_BINARY_7Z "")
SET(CPACK_BINARY_BUNDLE "")
SET(CPACK_BINARY_CYGWIN "")
SET(CPACK_BINARY_DEB "OFF")
SET(CPACK_BINARY_DRAGNDROP "")
SET(CPACK_BINARY_IFW "OFF")
SET(CPACK_BINARY_NSIS "OFF")
SET(CPACK_BINARY_OSXX11 "")
SET(CPACK_BINARY_PACKAGEMAKER "")
SET(CPACK_BINARY_RPM "OFF")
SET(CPACK_BINARY_STGZ "ON")
SET(CPACK_BINARY_TBZ2 "OFF")
SET(CPACK_BINARY_TGZ "ON")
SET(CPACK_BINARY_TXZ "OFF")
SET(CPACK_BINARY_TZ "ON")
SET(CPACK_BINARY_WIX "")
SET(CPACK_BINARY_ZIP "")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
SET(CPACK_INSTALL_CMAKE_PROJECTS "/PDAL;PDAL;ALL;/")
SET(CPACK_INSTALL_PREFIX "/usr/local")
SET(CPACK_MODULE_PATH "/PDAL/cmake/modules")
SET(CPACK_NSIS_DISPLAY_NAME "PDAL 1.7.7")
SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
SET(CPACK_NSIS_PACKAGE_NAME "PDAL 1.7.7")
SET(CPACK_OUTPUT_CONFIG_FILE "/PDAL/CPackConfig.cmake")
SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PDAL built using CMake")
SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.7-Linux")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "PDAL 1.7.7")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "PDAL 1.7.7")
SET(CPACK_PACKAGE_NAME "PDAL")
SET(CPACK_PACKAGE_RELOCATABLE "true")
SET(CPACK_PACKAGE_VENDOR "PDAL Development Team")
SET(CPACK_PACKAGE_VERSION "1.7.7")
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "7")
SET(CPACK_PACKAGE_VERSION_PATCH "7")
SET(CPACK_RESOURCE_FILE_LICENSE "/PDAL/LICENSE.txt")
SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-3.5/Templates/CPack.GenericWelcome.txt")
SET(CPACK_SET_DESTDIR "OFF")
SET(CPACK_SOURCE_7Z "")
SET(CPACK_SOURCE_CYGWIN "")
SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
SET(CPACK_SOURCE_TBZ2 "")
SET(CPACK_SOURCE_TGZ "")
SET(CPACK_SOURCE_TXZ "")
SET(CPACK_SOURCE_TZ "")
SET(CPACK_SOURCE_ZIP "")
SET(CPACK_SYSTEM_NAME "Linux")
SET(CPACK_TOPLEVEL_TAG "Linux")
SET(CPACK_WIX_SIZEOF_VOID_P "8")
if(NOT CPACK_PROPERTIES_FILE)
set(CPACK_PROPERTIES_FILE "/PDAL/CPackProperties.cmake")
endif()
if(EXISTS ${CPACK_PROPERTIES_FILE})
include(${CPACK_PROPERTIES_FILE})
endif()
CPackSourceConfig.cmake deleted 100644 → 0
View file @ 64ca670f
# This file will be configured to contain variables for CPack. These variables
# should be set in the CMake list file of the project before CPack module is
# included. The list of available CPACK_xxx variables and their associated
# documentation may be obtained using
# cpack --help-variable-list
#
# Some variables are common to all generators (e.g. CPACK_PACKAGE_NAME)
# and some are specific to a generator
# (e.g. CPACK_NSIS_EXTRA_INSTALL_COMMANDS). The generator specific variables
# usually begin with CPACK_<GENNAME>_xxxx.
SET(CPACK_BINARY_7Z "")
SET(CPACK_BINARY_BUNDLE "")
SET(CPACK_BINARY_CYGWIN "")
SET(CPACK_BINARY_DEB "OFF")
SET(CPACK_BINARY_DRAGNDROP "")
SET(CPACK_BINARY_IFW "OFF")
SET(CPACK_BINARY_NSIS "OFF")
SET(CPACK_BINARY_OSXX11 "")
SET(CPACK_BINARY_PACKAGEMAKER "")
SET(CPACK_BINARY_RPM "OFF")
SET(CPACK_BINARY_STGZ "ON")
SET(CPACK_BINARY_TBZ2 "OFF")
SET(CPACK_BINARY_TGZ "ON")
SET(CPACK_BINARY_TXZ "OFF")
SET(CPACK_BINARY_TZ "ON")
SET(CPACK_BINARY_WIX "")
SET(CPACK_BINARY_ZIP "")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
SET(CPACK_GENERATOR "TBZ2;TGZ")
SET(CPACK_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
SET(CPACK_INSTALLED_DIRECTORIES "/PDAL;/")
SET(CPACK_INSTALL_CMAKE_PROJECTS "")
SET(CPACK_INSTALL_PREFIX "/usr/local")
SET(CPACK_MODULE_PATH "/PDAL/cmake/modules")
SET(CPACK_NSIS_DISPLAY_NAME "PDAL 1.7.7")
SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
SET(CPACK_NSIS_PACKAGE_NAME "PDAL 1.7.7")
SET(CPACK_OUTPUT_CONFIG_FILE "/PDAL/CPackConfig.cmake")
SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PDAL built using CMake")
SET(CPACK_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "PDAL 1.7.7")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "PDAL 1.7.7")
SET(CPACK_PACKAGE_NAME "PDAL")
SET(CPACK_PACKAGE_RELOCATABLE "true")
SET(CPACK_PACKAGE_VENDOR "PDAL Development Team")
SET(CPACK_PACKAGE_VERSION "1.7.7")
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "7")
SET(CPACK_PACKAGE_VERSION_PATCH "7")
SET(CPACK_RESOURCE_FILE_LICENSE "/PDAL/LICENSE.txt")
SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-3.5/Templates/CPack.GenericDescription.txt")
SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-3.5/Templates/CPack.GenericWelcome.txt")
SET(CPACK_SET_DESTDIR "OFF")
SET(CPACK_SOURCE_7Z "")
SET(CPACK_SOURCE_CYGWIN "")
SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
SET(CPACK_SOURCE_IGNORE_FILES "/\\.gitattributes;/\\.vagrant;/\\.DS_Store;/CVS/;/\\.git/;\\.swp$;~$;\\.\\#;/\\#;CMakeScripts/;CMakeCache.txt;.xcodeproj;build.make;_CPack_Packages;cmake_install.cmake;Testing;PDAL.build/;/bin/;/lib/;/build/;Makefile;CMakeFiles;CTestTestfile.cmake;/test/data/local/;/doc/doxygen/;/doc/build/;/doc/presentations/;/doc/_static/logo/dongle/;/cmake/examples/;/include/pdal/pdal_defines.h;.gz2;.bz2")
SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/PDAL;/")
SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/PDAL/CPackSourceConfig.cmake")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "PDAL-1.7.1-src")
SET(CPACK_SOURCE_TBZ2 "")
SET(CPACK_SOURCE_TGZ "")
SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")
SET(CPACK_SOURCE_TXZ "")
SET(CPACK_SOURCE_TZ "")
SET(CPACK_SOURCE_ZIP "")
SET(CPACK_STRIP_FILES "")
SET(CPACK_SYSTEM_NAME "Linux")
SET(CPACK_TOPLEVEL_TAG "Linux-Source")
SET(CPACK_WIX_SIZEOF_VOID_P "8")
if(NOT CPACK_PROPERTIES_FILE)
set(CPACK_PROPERTIES_FILE "/PDAL/CPackProperties.cmake")
endif()
if(EXISTS ${CPACK_PROPERTIES_FILE})
include(${CPACK_PROPERTIES_FILE})
endif()
ChangeLog
View file @ 5df4a86d
2018-05-09
* Howard Butler <howard@hobu.co> note git2cl operation (11:01:37)
* Howard Butler <howard@hobu.co> * Workshop doc fixes (#2007) (10:47:20)
* Andrew Bell <andrew.bell.ia@gmail.com> Version numbers. (08:58:17)
* Andrew Bell <andrew.bell.ia@gmail.com> Review changes for 1.7.2 (07:31:37)
2018-05-07
* Andrew Bell <andrew.bell.ia@gmail.com> Allow replacement of artifacts (#2004) (15:02:38)
* Andrew Bell <andrew.bell.ia@gmail.com> Use pimpl/unique_ptr to make private headers private (#1990) (14:26:35)
* Andrew Bell <andrew.bell.ia@gmail.com> Don't bleed PDAL build info into subprojects (#1998) (13:38:27)
* Mateusz Loskot <mateusz@loskot.net> Remove www prefix from pdal.io references (#2003) (11:45:04)
* Howard Butler <howard@hobu.co> doc updates (11:45:29)
* Andrew Bell <andrew.bell.ia@gmail.com> Make southern UTM zones negative. (#1999) (11:08:32)
2018-05-06
* Michael D. Smith <michael.smith.erdc@gmail.com> Updates to batch processing workshop (#1996) (18:27:06)
* Howard Butler <howard@hobu.co> add link to batch processing example (17:24:14)
* Michael D. Smith <michael.smith.erdc@gmail.com> Add windows powershell batch processing exercise to workshop (#1995) (12:49:19)
2018-05-02
* Bradley J Chambers <brad.chambers@gmail.com> Improve the filters.approximatecoplanar documentation (11:38:49)
2018-04-26
* Howard Butler <howard@hobu.co> add a docker-based script for cutting a release (#1980) (14:21:25)
* Andrew Bell <andrew.bell.ia@gmail.com> Load plugin kernels. (#1979) (13:51:53)
* Andrew Bell <andrew.bell.ia@gmail.com> Allow underscores in stage names. (#1972) (13:30:22)
* Howard Butler <howard@hobu.co> ignore pdal_features for cpack #1976 (#1978) (13:27:59)
* Mateusz Loskot <mateusz@loskot.net> [cmake/FindGEOS] Add FindPackageHandleStandardArgs fallback if GEOS not found (#1977) (10:03:18)
2018-04-24
* Howard Butler <howard@hobu.co> add a note about geotiff errors (08:50:16)
* chambbj <brad.chambers@gmail.com> Make pdal-config owner writable (#1964) (08:12:53)
2018-04-23
* Andrew Bell <andrew.bell.ia@gmail.com> Assign test (#1932) (21:08:29)
* chambbj <brad.chambers@gmail.com> Ignore test/unit/TestConfig.hpp when packaging (#1943) (21:07:30)
* Andrew Bell <andrew.bell.ia@gmail.com> Handle warnings generated by Clang v. 6. (#1961) (21:06:25)
* Andrew Bell <andrew.bell.ia@gmail.com> Issue 1930 (#1931) (16:54:45)
* Andrew Bell <andrew.bell.ia@gmail.com> Build BPF with ZLIB when requested (#1960) (16:53:26)
* chambbj <brad.chambers@gmail.com> Use CMAKE_DL_LIBS (#1946) (16:52:19)
* Andrew Bell <andrew.bell.ia@gmail.com> Handle cr/lf endings on Windows in readers.text (#1963) (16:49:22)
* Andrew Bell <andrew.bell.ia@gmail.com> Warn about auto offset/scaling in stream mode. (11:52:26)
2018-04-14
* Howard Butler <howard@hobu.co> Add public accessor method for PointTableRef from PointView #1927 (#1928) (10:47:21)
2018-04-10
* Howard Butler <howard@hobu.co> always build OSGeo4W package, attempt to consolidate to a single appveyor build (17:44:33)
* Howard Butler <howard@hobu.co> always build appveyor with optional components (17:34:48)
* Bradley J Chambers <brad.chambers@gmail.com> Change centroid calculation to do online update and return doubles (09:39:56)
2018-04-09
* Howard Butler <howard@hobu.co> remove -Werror #1915 (16:14:50)
* Andrew Bell <andrew.bell.ia@gmail.com> Add some validation of Geotiff data. (#1913) (16:08:08)
2018-04-07
* Howard Butler <howard@hobu.co> fix up botched merge #1903 (10:21:35)
2018-04-06
* Howard Butler <howard@hobu.co> package during after_test, not before_deploy for OSGeo4W (16:38:53)
* Howard Butler <howard@hobu.co> install using before_deploy for appveyor (15:37:07)
* Howard Butler <howard@hobu.co> update front page with 1.7.1 (14:43:22)
* chambbj <brad.chambers@gmail.com> Fix computation of voxel indices (#1901) (14:36:50)
* Andrew Bell <andrew.bell.ia@gmail.com> Report error when we can't convert geotiff keys. (#1911) (14:36:28)
* Andrew Bell <andrew.bell.ia@gmail.com> Report error when we can't convert geotiff keys. Cloase #1910 (12:52:00)
* Andrew Bell <andrew.bell.ia@gmail.com> Initialize m_val in BaseHeaderVal to quiet compiler. (#1907) (12:34:50)
* Andrew Bell <andrew.bell.ia@gmail.com> Link in libdl where necessary. (#1903) (12:34:30)
* Howard Butler <howard@hobu.co> always checkout 1.7-maintenance branch when building PDAL Docker container (10:52:49)
* chambbj <brad.chambers@gmail.com> Move the eigen-dev package out of the virtual packages list (#1909) (10:47:32)
* Bradley J Chambers <brad.chambers@gmail.com> Move the eigen-dev package out of the virtual packages list (10:32:24)
* Andrew Bell <andrew.bell.ia@gmail.com> Initialize m_val in BaseHeaderVal to quiet compiler. Close #1899 (10:21:23)
* Howard Butler <howard@hobu.co> increment version information to 1.7.1 (10:18:57)
* Andrew Bell <andrew.bell.ia@gmail.com> Update comment to reflect current state of code. (09:58:17)
* Howard Butler <howard@hobu.co> another swing at windows batch (09:43:13)
* Bradley J Chambers <brad.chambers@gmail.com> Fix computation of voxel indices (09:03:31)
* Howard Butler <howard@hobu.co> bad batch file syntax (08:51:58)
* Howard Butler <howard@hobu.co> do deployment in deploy_script, only do it when OSGEO4W_BUILD==ON (08:17:16)
* Howard Butler <howard@hobu.co> run install in the build directory (00:11:40)
2018-04-02
* Howard Butler <howard@hobu.co> Install NumpyReader.hpp for use by Python extension (14:39:07)
* Howard Butler <howard@hobu.co> cache PDAL_PYTHON_VERSION_STRING to inform pdal-config and friends (16:55:41)
* Andrew Bell <andrew.bell.ia@gmail.com> Winfix (#1883) (15:04:55)
2018-04-05
* Howard Butler <howard@hobu.co> package osgeo4w in the after_build call, not deploy_script (23:33:10)
* Howard Butler <howard@hobu.co> turn back on OSGeo4W package building (22:08:00)
* Howard Butler <howard@hobu.co> more HOWTORELEASE (16:21:55)
* Howard Butler <howard@hobu.co> no SVG due to latexpdf (16:21:45)
* Howard Butler <howard@hobu.co> osgeo4w triggers from 1.7-maintenance branch now (16:03:43)
* Andrew Bell <andrew.bell.ia@gmail.com> Update doc. (14:35:04)
* Howard Butler <howard@hobu.co> release notes updates (14:12:19)
* Andrew Bell <andrew.bell.ia@gmail.com> Remove initializer from tm because it generates warning and we're going (#1898) (14:02:06)
* Howard Butler <howard@hobu.co> point to hipster interview for PDAL background (13:36:31)
* Connor Manning <connor@hobu.co> Fix comment typo. (10:58:26)
* Howard Butler <howard@hobu.co> note updating download.rst for HOWTORELEASE (10:00:18)
......@@ -17,10 +109,6 @@
* Andrew Bell <andrew.bell.ia@gmail.com> Add log timing on request. (#1884) (10:11:50)
* Andrew Bell <andrew.bell.ia@gmail.com> Add readers.numpy (#1887) (10:11:00)
 
2018-04-02
* Howard Butler <howard@hobu.co> cache PDAL_PYTHON_VERSION_STRING to inform pdal-config and friends (16:55:41)
* Andrew Bell <andrew.bell.ia@gmail.com> Winfix (#1883) (15:04:55)
2018-03-30
* chambbj <brad.chambers@gmail.com> Improve stage overview documentation (#1880) (12:52:39)
* Andrew Bell <andrew.bell.ia@gmail.com> Remove debug. (08:26:10)
......@@ -299,6 +387,9 @@
* Vicky Vergara <vicky@georepublic.de> appveyor: creating artifacts only on branch: 1.6-maintenance (#1752) (13:02:16)
* John Wass <jwass3@gmail.com> expose the stages of a pipeline (#1748) (11:10:23)
 
2017-12-19
* Andrew Bell <andrew.bell.ia@gmail.com> Don't write LAS geotiff VLRs if they contain no data. (15:38:16)
2017-12-18
* Loïc Messal <loic.messal@orange.fr> Typo (#1745) (11:17:34)
 
......
HOWTORELEASE.txt
View file @ 5df4a86d
......@@ -63,6 +63,12 @@ Release Process
3) Update ChangeLog with git2cl
* git2cl . > ChangeLog
* Delete any lines with "Merge" in them
::
git2cl . > Changelog
gsed -i '/Merge/d' ./ChangeLog
4) Build and run the tests. Really.
......
PDALConfig.cmake deleted 100644 → 0
View file @ 64ca670f
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
####### Any changes to this file will be overwritten by the next CMake run ####
####### The input file was PDALConfig.cmake.in ########
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
macro(set_and_check _var _file)
set(${_var} "${_file}")
if(NOT EXISTS "${_file}")
message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
endif()
endmacro()
macro(check_required_components _NAME)
foreach(comp ${${_NAME}_FIND_COMPONENTS})
if(NOT ${_NAME}_${comp}_FOUND)
if(${_NAME}_FIND_REQUIRED_${comp})
set(${_NAME}_FOUND FALSE)
endif()
endif()
endforeach()
endmacro()
####################################################################################
set(PDAL_VERSION_MAJOR 1)
set(PDAL_VERSION_MINOR 7)
set(PDAL_VERSION_PATCH 1)
set(PDAL_INCLUDE_DIRS)
set(PDAL_LIBRARY_DIRS)
foreach(_dir /usr/local/include)
set_and_check(_foo ${_dir})
list(APPEND PDAL_INCLUDE_DIRS ${_foo})
endforeach(_dir)
foreach(_dir /usr/local/lib)
set_and_check(_foo ${_dir})
list(APPEND PDAL_LIBRARY_DIRS ${_foo})
endforeach(_dir)
include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake")
if (WIN32)
# On windows link in pdal_util as well
set(PDAL_LIBRARIES "pdalcpp" "pdal_util")
else (WIN32)
set(PDAL_LIBRARIES "pdalcpp")
endif(WIN32)
check_required_components(PDAL)
PDALConfigVersion.cmake deleted 100644 → 0
View file @ 64ca670f
# This is a basic version file for the Config-mode of find_package().
# It is used by write_basic_package_version_file() as input file for configure_file()
# to create a version-file which can be installed along a config.cmake file.
#
# The created file sets PACKAGE_VERSION_EXACT if the current version string and
# the requested version string are exactly the same and it sets
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
# but only if the requested major version is the same as the current one.
# The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "1.7.1")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
if("1.7.1" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
else()
set(CVF_VERSION_MAJOR "1.7.1")
endif()
if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
set(PACKAGE_VERSION_COMPATIBLE TRUE)
else()
set(PACKAGE_VERSION_COMPATIBLE FALSE)
endif()
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
return()
endif()
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
math(EXPR installedBits "8 * 8")
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
set(PACKAGE_VERSION_UNSUITABLE TRUE)
endif()
PDALTargets.cmake deleted 100644 → 0
View file @ 64ca670f
# Generated by CMake 3.5.1
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
message(FATAL_ERROR "CMake >= 2.6.0 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.6)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------
# Commands may need to know the format version.
set(CMAKE_IMPORT_FILE_VERSION 1)
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
set(_targetsDefined)
set(_targetsNotDefined)
set(_expectedTargets)
foreach(_expectedTarget pdal_base pdal_util)
list(APPEND _expectedTargets ${_expectedTarget})
if(NOT TARGET ${_expectedTarget})
list(APPEND _targetsNotDefined ${_expectedTarget})
endif()
if(TARGET ${_expectedTarget})
list(APPEND _targetsDefined ${_expectedTarget})
endif()
endforeach()
if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)
return()
endif()
if(NOT "${_targetsDefined}" STREQUAL "")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
endif()
unset(_targetsDefined)
unset(_targetsNotDefined)
unset(_expectedTargets)
# Create imported target pdal_base
add_library(pdal_base SHARED IMPORTED)
set_target_properties(pdal_base PROPERTIES
INTERFACE_COMPILE_OPTIONS "-std=c++11;-Wextra;-Wpedantic;-Werror;-Wall;-Wno-unused-parameter;-Wno-unused-variable;-Wpointer-arith;-Wcast-align;-Wcast-qual;-Wredundant-decls;-Wno-long-long;-Wno-unknown-pragmas;-Wno-deprecated-declarations"
INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include;/usr/include/gdal;/usr/include"
INTERFACE_LINK_LIBRARIES "-lpthread;/usr/lib/libgdal.so;/usr/lib/x86_64-linux-gnu/libgeos_c.so;/usr/lib/libgeotiff.so;/usr/lib/liblaszip.so;/usr/lib/x86_64-linux-gnu/libxml2.so;/usr/lib/x86_64-linux-gnu/libz.so;/usr/lib/x86_64-linux-gnu/libcurl.so;/usr/lib/x86_64-linux-gnu/libjsoncpp.so"
)
# Create imported target pdal_util
add_library(pdal_util SHARED IMPORTED)
set_target_properties(pdal_util PROPERTIES
INTERFACE_COMPILE_OPTIONS "-std=c++11;-Wextra;-Wpedantic;-Werror;-Wall;-Wno-unused-parameter;-Wno-unused-variable;-Wpointer-arith;-Wcast-align;-Wcast-qual;-Wredundant-decls;-Wno-long-long;-Wno-unknown-pragmas;-Wno-deprecated-declarations"
INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include"
)
# Import target "pdal_base" for configuration ""
set_property(TARGET pdal_base APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
set_target_properties(pdal_base PROPERTIES
IMPORTED_LINK_DEPENDENT_LIBRARIES_NOCONFIG "pdal_util"
IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_base.so.7.0.1"
IMPORTED_SONAME_NOCONFIG "libpdal_base.so.6"
)
# Import target "pdal_util" for configuration ""
set_property(TARGET pdal_util APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
set_target_properties(pdal_util PROPERTIES
IMPORTED_LOCATION_NOCONFIG "/PDAL/lib/libpdal_util.so.7.0.1"
IMPORTED_SONAME_NOCONFIG "libpdal_util.so.6"
)
# This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set.
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)
README.md
View file @ 5df4a86d
......@@ -6,4 +6,4 @@ PDAL
[![Build Status](https://travis-ci.org/PDAL/PDAL.png?branch=master)](https://travis-ci.org/PDAL/PDAL)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/6dehrm0v22cw58d3/branch/master?svg=true)](https://ci.appveyor.com/project/hobu/pdal)
See http://www.pdal.io/ for more info
See http://pdal.io/ for more info
RELEASENOTES.txt → RELEASENOTES.rst
View file @ 5df4a86d
================================================================================
1.7.2
================================================================================
Bug Fixes
=========
- Don't write LAS GeoTIFF VLRs if they contain no data (#1914)
- Centroid computation should use doubles instead of floats (#1919)
- Fixup `-Werror`-related warnings (#1915)
- Fix linking to libdl for dlopen (#1902)
- BPF doesn't build with ZLIB (#1929)
- Packaging improvements (#1942, #1976, #1980, #1943)
- Explicitly allow underscores and capital letters in stage names
(implicit pre-1.7, hardened to disallow in 1.7.1) (#1923)
- Warn about auto scaling ``writers.las`` in stream mode (#1940)
- Handle cr/lf endings in Windows for ``readers.text`` (#1939 )
- Make ``pdal-config`` owner writeable for `Conda packaging <https://github.com/conda/conda-build/issues/2824#issuecomment-382776831>`__ (#1964)
- Allow replacement of artifacts (#1994)
- Fixed problem with UTM calculation for southern zones (#1989)
- Fixed issue with kernel plugins failing to load (#1971)
- Fixed problem where ``filters.ferry`` would create dimensions with
bad types (#1930)
================================================================================
1.7.0
================================================================================
......@@ -57,7 +81,7 @@ Enhancements
files.
- ``pdal info`` now provides the ``--enumerate`` option. See the
documentation for
`filters.stats <https://www.pdal.io/stages/filters.stats.html>`__ for
`filters.stats <https://pdal.io/stages/filters.stats.html>`__ for
details.
- Added a general option ``--logtiming`` to cause log output to contain
the elapsed time from the start of the program. (#1882)
......@@ -339,12 +363,12 @@ Enhancements
- ``filters.pmf`` and ``filters.smrf`` improved performance #1531 and
#1541
- ``filters.assign`` now supports
`Range <https://www.pdal.io/stages/filters.range.html>`__-based
`Range <https://pdal.io/stages/filters.range.html>`__-based
filters
- ``filters.outlier`` now accepts a user-specified ``class`` to
override the default value of ``7`` for points deemed outliers. #1545
- ``filters.pmf`` and ``filters.smrf`` now accept a
`Range <https://www.pdal.io/stages/ranges.html#ranges>`__ via the
`Range <https://pdal.io/stages/ranges.html#ranges>`__ via the
``ignore`` option to specify values that should be excluded from
ground segmentation. #1545
- ``filters.pmf`` and ``filters.smrf`` now consider only last returns
......
apps/CMakeLists.txt
View file @ 5df4a86d
......@@ -16,8 +16,15 @@ if (APPLE AND PDAL_BUNDLE)
else (APPLE AND PDAL_BUNDLE)
add_executable(${PDAL_APP} pdal.cpp)
endif(APPLE AND PDAL_BUNDLE)
target_link_libraries(${PDAL_APP} PRIVATE
${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME})
pdal_target_compile_settings(${PDAL_APP})
target_link_libraries(${PDAL_APP}
PRIVATE
${PDAL_BASE_LIB_NAME}
${PDAL_UTIL_LIB_NAME}
${PDAL_JSONCPP_LIB_NAME}
${GDAL_LIBRARY}
${WINSOCK_LIBRARY}
)
target_include_directories(${PDAL_APP} PRIVATE
${PDAL_JSONCPP_INCLUDE_DIR}
${PDAL_INCLUDE_DIR}
......@@ -72,14 +79,14 @@ if(UNIX OR APPLE)
DESTINATION
"${PDAL_OUTPUT_BIN_DIR}/"
FILE_PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
install(PROGRAMS "${PDAL_OUTPUT_BIN_DIR}/pdal-config"
DESTINATION
"${CMAKE_INSTALL_PREFIX}/bin"
PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
elseif(WIN32)
......@@ -91,14 +98,14 @@ elseif(WIN32)
DESTINATION
"${PDAL_OUTPUT_BIN_DIR}/"
FILE_PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
install(PROGRAMS "${PDAL_OUTPUT_BIN_DIR}/pdal-config.bat"
DESTINATION
"${CMAKE_INSTALL_PREFIX}/bin"
PERMISSIONS
OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
endif()
apps/pdal-config
View file @ 5df4a86d
......@@ -58,7 +58,7 @@ case $1 in
;;
--version)
echo 1.7.1
echo 1.7.2
;;
--python-version)
......
apps/pdal.cpp
View file @ 5df4a86d
......@@ -73,7 +73,6 @@ private:
void outputOptions();
void outputOptions(const std::string& stageName,std::ostream& strm);
void addArgs(ProgramArgs& args);
std::string findKernel();
std::ostream& m_out;
......@@ -160,7 +159,6 @@ void App::outputDrivers()
}
else
{
Json::Value array(Json::arrayValue);
for (auto name : stages)
{
......@@ -172,9 +170,7 @@ void App::outputDrivers()
node["link"] = link;
array.append(node);
}
m_out << array;
}
}
......@@ -183,9 +179,14 @@ void App::outputCommands(const std::string& leader)
{
StageFactory f;
PluginManager<Kernel>::loadAll();
std::string kernelbase("kernels.");
for (auto name : PluginManager<Kernel>::names())
{
if (Utils::startsWith(name, kernelbase))
name = name.substr(kernelbase.size());
m_out << leader << name << std::endl;
}
}
void App::outputOptions(std::string const& stageName, std::ostream& strm)
......@@ -200,7 +201,6 @@ void App::outputOptions(std::string const& stageName, std::ostream& strm)
return;
}
ProgramArgs args;
s->addAllArgs(args);
......@@ -226,7 +226,6 @@ void App::outputOptions(std::string const& stageName, std::ostream& strm)
object[stageName] = array;
strm << object;
}
}
......@@ -245,7 +244,8 @@ void App::outputOptions()
outputOptions(n, m_out);
m_out << std::endl;
}
} else
}
else
{
std::ostringstream strm;
Json::Value options (Json::arrayValue);
......@@ -260,7 +260,6 @@ void App::outputOptions()
strm.str("");
}
m_out << options;
}
}
......@@ -303,35 +302,6 @@ int main(int argc, char* argv[])
}
std::string App::findKernel()
{
StringList loadedKernels;
auto kernelSurname = [](const std::string& name)
{
StringList names = Utils::split2(name, '.');
return names.size() == 2 ? names[1] : std::string();
};
StageFactory f(true);
// Discover available kernels without plugins, and test to see if
// the positional option 'command' is a valid kernel
loadedKernels = PluginManager<Kernel>::names();
for (auto& name : loadedKernels)
if (m_command == kernelSurname(name))
return name;
// Force loading of plugins.
StageFactory f2(false);
loadedKernels = PluginManager<Kernel>::names();
for (auto& name : loadedKernels)
if (m_command == kernelSurname(name))
return name;
return std::string();
}
int App::execute(StringList& cmdArgs, LogPtr& log)
{
ProgramArgs args;
......@@ -374,12 +344,13 @@ int App::execute(StringList& cmdArgs, LogPtr& log)
if (!m_command.empty())
{
int ret = 0;
std::string name(findKernel());
if (name.size())
std::string name("kernels." + m_command);
Kernel *kernel = PluginManager<Kernel>::createObject(name);
if (kernel)
{
if (m_help)
cmdArgs.push_back("--help");
Kernel *kernel = PluginManager<Kernel>::createObject(name);
// This shouldn't throw. If it does, it's something awful, so
// not cleaning up seems inconsequential.
log->setLeader("pdal " + m_command);
......
apps/pdal.pc deleted 100644 → 0
View file @ 64ca670f
prefix=/usr/local
exec_prefix=/usr/local/bin
libdir=/usr/local/
includedir=/usr/local/include
Name: PDAL
Description: Point Data Abstraction Library
Requires: gdal libxml-2.0 geos
Version: 1.7.1
Libs: -L${libdir} -lpdalcpp
Cflags: -I${includedir}/pdal
appveyor.yml
View file @ 5df4a86d
......@@ -13,9 +13,7 @@ environment:
OSGEO4W_ROOT: C:\\OSGeo4W64
matrix:
- PDAL_OPTIONAL_COMPONENTS: OFF
- PDAL_OPTIONAL_COMPONENTS: ON
- OSGEO4W_BUILD: ON
# Should speed up repository cloning
shallow_clone: true
......@@ -51,7 +49,10 @@ build_script:
test_script:
- call scripts\\appveyor\\test.cmd
deploy_script:
# We need to install so the artifacts are ready
# for deployment for the OSGeo4W build for all
# other build types, no artifact is made
after_test:
- call scripts\\appveyor\\install.cmd
artifacts:
......
cmake/cpack.cmake
View file @ 5df4a86d
......@@ -32,12 +32,13 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CTestTestfile.cmake")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/data/local/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/unit/TestConfig.hpp")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/doxygen/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/build/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/presentations/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/_static/logo/dongle/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/cmake/examples/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/include/pdal/pdal_defines.h")
list(APPEND CPACK_SOURCE_IGNORE_FILES "pdal_features.hpp")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz2")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
......
cmake/json.cmake
View file @ 5df4a86d
......@@ -13,7 +13,6 @@ if (JSONCPP_FOUND)
include_directories(${JSONCPP_INCLUDE_DIR})
set(PDAL_JSONCPP_LIB_NAME ${JSONCPP_LIBRARY})
set(PDAL_JSONCPP_INCLUDE_DIR ${JSONCPP_INCLUDE_DIR})
set(JSON_CPP_LINK_TYPE PUBLIC)
set(PDAL_HAVE_JSONCPP 1)
else()
unset(JSONCPP_INCLUDE_DIR CACHE)
......@@ -22,7 +21,6 @@ else()
set(PDAL_JSONCPP_LIB_NAME pdal_jsoncpp)
set(PDAL_JSONCPP_INCLUDE_DIR ${PDAL_VENDOR_DIR}/jsoncpp/dist)
set(PDAL_JSONCPP_SRC ${PDAL_JSONCPP_INCLUDE_DIR}/jsoncpp.cpp)
set(JSON_CPP_LINK_TYPE PRIVATE)
endif()
set_property(GLOBAL PROPERTY _JSONCPP_INCLUDED TRUE)
cmake/macros.cmake
View file @ 5df4a86d
......@@ -54,7 +54,7 @@ macro(PDAL_ADD_LIBRARY _name)
set_property(TARGET ${_name} PROPERTY FOLDER "Libraries")
target_include_directories(${_name} PRIVATE
${PDAL_INCLUDE_DIR})
PDAL_TARGET_COMPILE_SETTINGS(${_name})
pdal_target_compile_settings(${_name})
install(TARGETS ${_name}
EXPORT PDALTargets
......@@ -74,7 +74,7 @@ macro(PDAL_ADD_FREE_LIBRARY _name _library_type)
set_property(TARGET ${_name} PROPERTY FOLDER "Libraries")
target_include_directories(${_name} PRIVATE
${PDAL_INCLUDE_DIR})
PDAL_TARGET_COMPILE_SETTINGS(${_name})
pdal_target_compile_settings(${_name})
install(TARGETS ${_name}
EXPORT PDALTargets
......@@ -127,13 +127,17 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
endif()
add_library(${${_name}} SHARED ${PDAL_ADD_PLUGIN_FILES})
pdal_target_compile_settings(${${_name}})
target_include_directories(${${_name}} PRIVATE
${PROJECT_BINARY_DIR}/include
${PDAL_INCLUDE_DIR})
target_link_libraries(${${_name}} PUBLIC
target_link_libraries(${${_name}}
PUBLIC
${PDAL_BASE_LIB_NAME}
${PDAL_UTIL_LIB_NAME}
${PDAL_ADD_PLUGIN_LINK_WITH})
${PDAL_ADD_PLUGIN_LINK_WITH}
${WINSOCK_LIBRARY}
)
set_property(TARGET ${${_name}} PROPERTY FOLDER "Plugins/${_type}")
set_target_properties(${${_name}} PROPERTIES
......@@ -168,19 +172,22 @@ macro(PDAL_ADD_TEST _name)
endif()
add_executable(${_name} ${PDAL_ADD_TEST_FILES}
$<TARGET_OBJECTS:${PDAL_TEST_SUPPORT_OBJS}>)
pdal_target_compile_settings(${_name})
target_include_directories(${_name} PRIVATE
${ROOT_DIR}
${PDAL_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/test/unit
${PROJECT_BINARY_DIR}/test/unit
${PROJECT_BINARY_DIR}/include)
set_target_properties(${_name}
PROPERTIES
COMPILE_DEFINITIONS PDAL_DLL_IMPORT)
set_property(TARGET ${_name} PROPERTY FOLDER "Tests")
target_link_libraries(${_name} PRIVATE
${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME} gtest
${PDAL_ADD_TEST_LINK_WITH})
target_link_libraries(${_name}
PRIVATE
${PDAL_BASE_LIB_NAME}
${PDAL_UTIL_LIB_NAME}
gtest
${PDAL_ADD_TEST_LINK_WITH}
${WINSOCK_LIBRARY}
)
add_test(NAME ${_name}
COMMAND
"${PROJECT_BINARY_DIR}/bin/${_name}"
......