Merge remote-tracking branch 'origin/master' into roofs

PDAL · Jan 28, 2019 · 4be5364 · 4be5364
2 parents 0be300f + 755ac1a
commit 4be5364
Show file tree

Hide file tree

Showing 29 changed files with 421 additions and 294 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,6 +129,7 @@ include(${PDAL_CMAKE_DIR}/json.cmake)
 include(${PDAL_CMAKE_DIR}/libxml2.cmake)
 include(${PDAL_CMAKE_DIR}/dimension.cmake)
 include(${PDAL_CMAKE_DIR}/arbiter.cmake)
+include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
 
 #------------------------------------------------------------------------------
 # generate the pdal_features.hpp header

diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -1,13 +1,13 @@
 set(INCLUDE_INSTALL_DIR include/ CACHE PATH "include")
-set(LIB_INSTALL_DIR lib/ CACHE PATH "lib")
+set(LIB_INSTALL_DIR ${PDAL_LIB_INSTALL_DIR} CACHE PATH "lib")
 set(SYSCONFIG_INSTALL_DIR etc/pdal/ CACHE PATH "sysconfig")
 
 include(CMakePackageConfigHelpers)
 
 set(PDAL_CONFIG_INCLUDE_DIRS
   "${CMAKE_INSTALL_PREFIX}/include")
 set(PDAL_CONFIG_LIBRARY_DIRS
-  "${CMAKE_INSTALL_PREFIX}/lib")
+  "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
 
 configure_package_config_file(
   PDALConfig.cmake.in

diff --git a/cmake/macros.cmake b/cmake/macros.cmake
@@ -107,6 +107,7 @@ endmacro(PDAL_ADD_EXECUTABLE)
 # ARGN :
 #    FILES the source files for the plugin
 #    LINK_WITH link plugin with libraries
+#    INCLUDES header directories
 #
 # The "generate_dimension_hpp" ensures that Dimension.hpp is built before
 #  attempting to build anything else in the "library".
@@ -116,7 +117,7 @@ endmacro(PDAL_ADD_EXECUTABLE)
 macro(PDAL_ADD_PLUGIN _name _type _shortname)
     set(options)
     set(oneValueArgs)
-    set(multiValueArgs FILES LINK_WITH)
+    set(multiValueArgs FILES LINK_WITH INCLUDES)
     cmake_parse_arguments(PDAL_ADD_PLUGIN "${options}" "${oneValueArgs}"
         "${multiValueArgs}" ${ARGN})
     if(WIN32)
@@ -133,7 +134,9 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
     pdal_target_compile_settings(${${_name}})
     target_include_directories(${${_name}} PRIVATE
         ${PROJECT_BINARY_DIR}/include
-        ${PDAL_INCLUDE_DIR})
+        ${PDAL_INCLUDE_DIR}
+        ${PDAL_ADD_PLUGIN_INCLUDES}
+    )
     target_link_libraries(${${_name}}
         PRIVATE
             ${PDAL_BASE_LIB_NAME}
@@ -164,10 +167,12 @@ endmacro(PDAL_ADD_PLUGIN)
 # ARGN :
 #    FILES the source files for the test
 #    LINK_WITH link test executable with libraries
+#    INCLUDES header file directories
+#
 macro(PDAL_ADD_TEST _name)
     set(options)
     set(oneValueArgs)
-    set(multiValueArgs FILES LINK_WITH)
+    set(multiValueArgs FILES LINK_WITH INCLUDES)
     cmake_parse_arguments(PDAL_ADD_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
     if (WIN32)
         list(APPEND ${PDAL_ADD_TEST_FILES} ${PDAL_TARGET_OBJECTS})
@@ -179,6 +184,7 @@ macro(PDAL_ADD_TEST _name)
     target_include_directories(${_name} PRIVATE
         ${ROOT_DIR}
         ${PDAL_INCLUDE_DIR}
+        ${PDAL_ADD_TEST_INCLUDES}
         ${PROJECT_SOURCE_DIR}/test/unit
         ${PROJECT_BINARY_DIR}/test/unit
         ${PROJECT_BINARY_DIR}/include)

diff --git a/cmake/openssl.cmake b/cmake/openssl.cmake
@@ -0,0 +1,8 @@
+find_package(OpenSSL 1.0.1)
+if (OPENSSL_FOUND)
+    set(ARBITER_OPENSSL TRUE)
+else()
+    # For me this is /usr/local/opt/openssl\@1.1
+    message("OpenSSL NOT found - `export OPENSSL_ROOT_DIR=___`")
+    message("Google storage IO will not be available")
+endif()
diff --git a/doc/stages/writers.ply.rst b/doc/stages/writers.ply.rst
@@ -11,8 +11,6 @@ mesh suitable for output as faces.
 
 .. embed::
 
-.. streamable::
-
 Example
 -------
 

diff --git a/pdal/Reader.cpp b/pdal/Reader.cpp
@@ -57,6 +57,14 @@ void Reader::readerAddArgs(ProgramArgs& args)
 
 void Reader::setSpatialReference(MetadataNode& m, const SpatialReference& srs)
 {
+    if (srs.empty() && !m_defaultSrs.empty())
+    {
+        // If an attempt comes in to clear the SRS but we have a default,
+        // revert to the default rather than clearing.
+        Stage::setSpatialReference(m, m_defaultSrs);
+        return;
+    }
+
     if (getSpatialReference().empty() || m_overrideSrs.empty())
     {
         Stage::setSpatialReference(m, srs);

diff --git a/plugins/cpd/CMakeLists.txt b/plugins/cpd/CMakeLists.txt
@@ -7,15 +7,21 @@ set(files filters/CpdFilter.cpp)
 set(include_dirs "${CMAKE_CURRENT_LIST_DIR}" "${PDAL_VENDOR_DIR}/eigen")
 
 PDAL_ADD_PLUGIN(filter_libname filter cpd
-    FILES filters/CpdFilter.cpp
-    LINK_WITH Cpd::Library-C++
+    FILES
+        filters/CpdFilter.cpp
+    LINK_WITH
+        Cpd::Library-C++
+    INCLUDES
+        "${include_dirs}"
     )
-target_include_directories(${filter_libname} PRIVATE "${include_dirs}")
 
 if(${WITH_TESTS})
     PDAL_ADD_TEST(pdal_filters_cpd_test
-        FILES test/CpdFilterTest.cpp
-        LINK_WITH ${filter_libname}
+        FILES
+            test/CpdFilterTest.cpp
+        LINK_WITH
+            ${filter_libname}
+        INCLUDES
+            "${include_dirs}"
         )
-    target_include_directories(pdal_filters_cpd_test PRIVATE "${include_dirs}")
 endif()
diff --git a/plugins/fbx/CMakeLists.txt b/plugins/fbx/CMakeLists.txt
@@ -26,17 +26,21 @@ if (FBX_FOUND)
             io/FbxWriter.cpp
         LINK_WITH
             ${FBX_LIBRARY}
-            ${CORE_FOUNDATION})
-    target_include_directories(${writer_libname} PRIVATE
-        ${PDAL_IO_DIR}
-        ${FBX_INCLUDE_DIR})
+            ${CORE_FOUNDATION}
+        INCLUDES
+            ${PDAL_IO_DIR}
+            ${FBX_INCLUDE_DIR}
+    )
 
     if (WITH_TESTS)
         PDAL_ADD_TEST(fbxtest
-            FILES test/FbxWriterTest.cpp
-            LINK_WITH ${writer_libname})
-        target_include_directories(fbxtest PRIVATE
-            ${PDAL_IO_DIR})
+            FILES
+                test/FbxWriterTest.cpp
+            LINK_WITH
+                ${writer_libname}
+            INCLUDES
+                ${PDAL_IO_DIR}
+        )
     endif()
 else()
     message(STATUS "Building without FBX support")

diff --git a/plugins/greyhound/CMakeLists.txt b/plugins/greyhound/CMakeLists.txt
@@ -20,6 +20,9 @@ PDAL_ADD_PLUGIN(reader_libname reader greyhound
     LINK_WITH
         ${PDAL_JSONCPP_LIB_NAME}
         ${WINSOCK_LIBRARY}
+    INCLUDES
+        ${PDAL_JSONCPP_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}
 )
 
 PDAL_ADD_PLUGIN(writer_libname writer greyhound
@@ -31,15 +34,11 @@ PDAL_ADD_PLUGIN(writer_libname writer greyhound
     LINK_WITH
         ${PDAL_JSONCPP_LIB_NAME}
         ${WINSOCK_LIBRARY}
+    INCLUDES
+        ${PDAL_JSONCPP_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}
 )
 
-target_include_directories(${reader_libname} PRIVATE
-    ${PDAL_JSONCPP_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR})
-
-target_include_directories(${writer_libname} PRIVATE
-    ${PDAL_JSONCPP_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR})
 
 if (WITH_TESTS)
     PDAL_ADD_TEST(pdal_io_greyhound_reader_test
@@ -49,8 +48,8 @@ if (WITH_TESTS)
             ${reader_libname}
             ${writer_libname}
             ${PDAL_JSONCPP_LIB_NAME}
+        INCLUDES
+            ${PDAL_JSONCPP_INCLUDE_DIR}
+            ${PDAL_VENDOR_DIR}
     )
-    target_include_directories(pdal_io_greyhound_reader_test PRIVATE
-        ${PDAL_JSONCPP_INCLUDE_DIR}
-        ${PDAL_VENDOR_DIR})
 endif()
diff --git a/plugins/i3s/CMakeLists.txt b/plugins/i3s/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+include(${PDAL_CMAKE_DIR}/zlib.cmake)
+
 add_subdirectory(lepcc)
 
 PDAL_ADD_PLUGIN(i3s_reader_libname reader i3s
@@ -10,6 +12,20 @@ PDAL_ADD_PLUGIN(i3s_reader_libname reader i3s
     LINK_WITH
         ${PDAL_JSONCPP_LIB_NAME}
         ${WINSOCK_LIBRARY}
+        ${GDAL_LIBRARY}
+        ${ZLIB_LIBRARY}
+        lepcc
+    INCLUDES
+        ${PDAL_JSONCPP_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}
+        ${LEPCC_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}/eigen
+        ${GDAL_INCLUDE_DIR}
+)
+target_compile_definitions(${i3s_reader_libname}
+    PRIVATE
+        ARBITER_ZLIB
+        ARBITER_DLL_IMPORT
 )
 
 PDAL_ADD_PLUGIN(slpk_reader_libname reader slpk
@@ -21,49 +37,22 @@ PDAL_ADD_PLUGIN(slpk_reader_libname reader slpk
     LINK_WITH
         ${PDAL_JSONCPP_LIB_NAME}
         ${WINSOCK_LIBRARY}
-)
-
-
-target_link_libraries(${i3s_reader_libname} PRIVATE
-    ${GDAL_LIBRARY}
-    ${ZLIB_LIBRARY}
-    lepcc
-)
-
-target_link_libraries(${slpk_reader_libname} PRIVATE
-    ${GDAL_LIBRARY}
-    ${ZLIB_LIBRARY}
-    lepcc
-)
-
-include(${PDAL_CMAKE_DIR}/zlib.cmake)
-target_compile_definitions(${i3s_reader_libname}
-    PRIVATE
-        ARBITER_ZLIB
-        ARBITER_DLL_IMPORT
+        ${GDAL_LIBRARY}
+        ${ZLIB_LIBRARY}
+        lepcc
+    INCLUDES
+        ${PDAL_JSONCPP_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}
+        ${LEPCC_INCLUDE_DIR}
+        ${PDAL_VENDOR_DIR}/eigen
+        ${GDAL_INCLUDE_DIR}
 )
 target_compile_definitions(${slpk_reader_libname}
     PRIVATE
         ARBITER_ZLIB
         ARBITER_DLL_IMPORT
 )
 
-target_include_directories(${i3s_reader_libname} PRIVATE
-    ${PDAL_JSONCPP_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR}
-    ${LEPCC_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR}/eigen
-    ${GDAL_INCLUDE_DIR}
-)
-
-target_include_directories(${slpk_reader_libname} PRIVATE
-    ${PDAL_JSONCPP_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR}
-    ${LEPCC_INCLUDE_DIR}
-    ${PDAL_VENDOR_DIR}/eigen
-    ${GDAL_INCLUDE_DIR}
-)
-
 if (WITH_TESTS)
     PDAL_ADD_TEST(pdal_io_slpk_reader_test
             FILES
@@ -72,13 +61,12 @@ if (WITH_TESTS)
                 ${slpk_reader_libname}
                 ${PDAL_JSONCPP_LIB_NAME}
                 ${GDAL_LIBRARY}
-    )
-    target_include_directories(pdal_io_slpk_reader_test PRIVATE
-            ${PDAL_JSONCPP_INCLUDE_DIR}
-            ${PDAL_VENDOR_DIR}
-            ${LEPCC_INCLUDE_DIR}
-            ${PDAL_VENDOR_DIR}/eigen
-            ${GDAL_INCLUDE_DIR}
+            INCLUDES
+                ${PDAL_JSONCPP_INCLUDE_DIR}
+                ${PDAL_VENDOR_DIR}
+                ${LEPCC_INCLUDE_DIR}
+                ${PDAL_VENDOR_DIR}/eigen
+                ${GDAL_INCLUDE_DIR}
     )
     target_compile_definitions(pdal_io_slpk_reader_test
         PRIVATE
@@ -94,13 +82,12 @@ if (WITH_TESTS)
                     ${i3s_reader_libname}
                     ${PDAL_JSONCPP_LIB_NAME}
                     ${GDAL_LIBRARY}
-        )
-        target_include_directories(pdal_io_i3s_reader_test PRIVATE
-                ${PDAL_JSONCPP_INCLUDE_DIR}
-                ${PDAL_VENDOR_DIR}
-                ${LEPCC_INCLUDE_DIR}
-                ${PDAL_VENDOR_DIR}/eigen
-                ${GDAL_INCLUDE_DIR}
+                INCLUDES
+                    ${PDAL_JSONCPP_INCLUDE_DIR}
+                    ${PDAL_VENDOR_DIR}
+                    ${LEPCC_INCLUDE_DIR}
+                    ${PDAL_VENDOR_DIR}/eigen
+                    ${GDAL_INCLUDE_DIR}
         )
         target_compile_definitions(pdal_io_i3s_reader_test
             PRIVATE

diff --git a/plugins/icebridge/CMakeLists.txt b/plugins/icebridge/CMakeLists.txt
@@ -12,11 +12,12 @@ else()
         FILES
             io/IcebridgeReader.cpp
             io/Hdf5Handler.cpp
-        LINK_WITH ${HDF5_LIBRARIES})
-    target_include_directories(${libname}
-        PRIVATE
+        LINK_WITH
+            ${HDF5_LIBRARIES}
+        INCLUDES
             ${ROOT_DIR}
-            ${LIBXML2_INCLUDE_DIR})
+            ${LIBXML2_INCLUDE_DIR}
+    )
 
     if (WITH_TESTS)
         PDAL_ADD_TEST(icetest