Skip to content

Commit

Permalink
Sibling of 7f532de
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Mar 27, 2019
1 parent ddac23f commit 72281e2
Show file tree
Hide file tree
Showing 253 changed files with 45,887 additions and 9,190 deletions.
97 changes: 0 additions & 97 deletions .clang-format

This file was deleted.

2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ test/unit/TestConfig.hpp

test/data/bpf/bpf.xml
test/data/bpf/bpf2nitf.xml
test/data/ept/addon/*
test/data/filters/attribute.xml
test/data/filters/chip.xml
test/data/filters/chipper.xml
Expand Down Expand Up @@ -165,7 +164,6 @@ test/data/qfit/little-endian-conversion.xml
test/data/qfit/pipeline.xml
test/data/qfit/reader.xml
test/data/sbet/pipeline.xml
test/data/**/*.aux.xml

python/*.egg*
python/build/*
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ set(PDAL_BUILD_TYPE ${CMAKE_BUILD_TYPE})
#------------------------------------------------------------------------------

include(${PDAL_CMAKE_DIR}/gdal.cmake)
include(${PDAL_CMAKE_DIR}/geos.cmake)
include(${PDAL_CMAKE_DIR}/geotiff.cmake) # Optional (not really)
include(${PDAL_CMAKE_DIR}/lazperf.cmake) # Optional
include(${PDAL_CMAKE_DIR}/laszip.cmake) # Optional
Expand Down Expand Up @@ -258,20 +259,22 @@ target_include_directories(${PDAL_BASE_LIB_NAME}
${PDAL_JSONCPP_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
${ZSTD_INCLUDE_DIRS}
PUBLIC
INTERFACE
${GDAL_INCLUDE_DIR}
${LASZIP_INCLUDE_DIR}
)
target_link_libraries(${PDAL_BASE_LIB_NAME}
PRIVATE
${CMAKE_THREAD_LIBS_INIT}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
${GEOTIFF_LIBRARY}
${LASZIP_LIBRARY}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${LIBLZMA_LIBRARIES}
${ZSTD_LIBRARIES}
${CURL_LIBRARIES}
${WINSOCK_LIBRARY}
${PDAL_REEXPORT}
${PDAL_UTIL_LIB_NAME}
Expand Down Expand Up @@ -376,9 +379,10 @@ install(
EXPORT
PDALTargets
DESTINATION
"${PDAL_LIB_INSTALL_DIR}/cmake/PDAL")
"${PDAL_LIB_INSTALL_DIR}/pdal/cmake")
include(${PDAL_CMAKE_DIR}/config.cmake)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES)
export(PACKAGE PDAL)

# TODO: move under scripts/bash-completion ?
if (WITH_COMPLETION)
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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](https://pdal.io/project/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

Expand All @@ -35,7 +35,7 @@ Fixes #123.

## Additional Resources

* [PDAL's coding conventions](https://pdal.io/project/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
Expand Down

0 comments on commit 72281e2

Please sign in to comment.