Skip to content

Commit

Permalink
OpenSSL support
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-chaulet committed Mar 28, 2019
1 parent 3734648 commit 49fb365
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,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
Expand Down
8 changes: 8 additions & 0 deletions cmake/openssl.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
find_package(OpenSSL 1.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()
7 changes: 5 additions & 2 deletions vendor/arbiter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ endif()
PDAL_ADD_FREE_LIBRARY(${PDAL_ARBITER_LIB_NAME} STATIC arbiter.cpp)
target_include_directories(${PDAL_ARBITER_LIB_NAME}
PRIVATE
${PDAL_JSONCPP_INCLUDE_DIR})
${PDAL_JSONCPP_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR})
target_link_libraries(${PDAL_ARBITER_LIB_NAME}
PRIVATE
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
${PDAL_JSONCPP_LIB_NAME})
target_compile_definitions(${PDAL_ARBITER_LIB_NAME}
PRIVATE
ARBITER_CURL)
ARBITER_CURL
ARBITER_OPENSSL)

if (MSVC)
find_library(SHLWAPI Shlwapi.lib)
Expand Down

0 comments on commit 49fb365

Please sign in to comment.