Skip to content

Commit

Permalink
Made compression modules optional.
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed Nov 27, 2017
1 parent d5090e7 commit f413e65
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 28 deletions.
24 changes: 14 additions & 10 deletions cmake/lzma.cmake
@@ -1,14 +1,18 @@
#
# LZMA support
#
find_package(LibLZMA REQUIRED)
set_package_properties(LibLZMA PROPERTIES TYPE REQUIRED
PURPOSE "General compression support")
if(LIBLZMA_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
"${LIBLZMA_LIBRARIES}")
include_directories(${LIBLZMA_INCLUDE_DIRS})
mark_as_advanced(CLEAR LIBLZMA_INCLUDE_DIRS)
mark_as_advanced(CLEAR LIBLZMA_LIBRARIES)
set(PDAL_HAVE_LZMA 1)
option(WITH_LZMA
"Build support for compression/decompression with LZMA" FALSE)
if (WITH_LZMA)
find_package(LibLZMA REQUIRED)
set_package_properties(LibLZMA PROPERTIES TYPE REQUIRED
PURPOSE "General compression support")
if(LIBLZMA_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
"${LIBLZMA_LIBRARIES}")
include_directories(${LIBLZMA_INCLUDE_DIRS})
mark_as_advanced(CLEAR LIBLZMA_INCLUDE_DIRS)
mark_as_advanced(CLEAR LIBLZMA_LIBRARIES)
set(PDAL_HAVE_LZMA 1)
endif()
endif()
23 changes: 14 additions & 9 deletions cmake/zlib.cmake
@@ -1,13 +1,18 @@
#
# ZLIB support
#
find_package(ZLIB REQUIRED)
set_package_properties(ZLIB PROPERTIES TYPE REQUIRED
option(WITH_ZLIB
"Build support for compression/decompression with zlib/deflate.")
if (WITH_ZLIB)
find_package(ZLIB REQUIRED)
set_package_properties(ZLIB PROPERTIES TYPE REQUIRED
PURPOSE "Compression support in BPF")
if(ZLIB_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "${ZLIB_LIBRARY}")
include_directories(${ZLIB_INCLUDE_DIR})
mark_as_advanced(CLEAR ZLIB_INCLUDE_DIR)
mark_as_advanced(CLEAR ZLIB_LIBRARY)
set(PDAL_HAVE_ZLIB 1)
endif()
if(ZLIB_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
"${ZLIB_LIBRARY}")
include_directories(${ZLIB_INCLUDE_DIR})
mark_as_advanced(CLEAR ZLIB_INCLUDE_DIR)
mark_as_advanced(CLEAR ZLIB_LIBRARY)
set(PDAL_HAVE_ZLIB 1)
endif(ZLIB_FOUND)
endif(WITH_ZLIB)
22 changes: 13 additions & 9 deletions cmake/zstd.cmake
@@ -1,13 +1,17 @@
#
# LZMA support
#
find_package(ZSTD REQUIRED)
set_package_properties(ZSTD PROPERTIES TYPE REQUIRED
option(WITH_ZSTD
"Build support for compression/decompression with Zstd.")
if (WITH_ZSTD)
find_package(ZSTD REQUIRED)
set_package_properties(ZSTD PROPERTIES TYPE REQUIRED
PURPOSE "General compression support")
if(ZSTD_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
"${ZSTD_STATIC_LIB}")
mark_as_advanced(CLEAR ZSTD_INCLUDE_DIRS)
mark_as_advanced(CLEAR ZSTD_LIBRARIES)
set(PDAL_HAVE_ZSTD 1)
endif()
if (ZSTD_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
"${ZSTD_STATIC_LIB}")
mark_as_advanced(CLEAR ZSTD_INCLUDE_DIRS)
mark_as_advanced(CLEAR ZSTD_LIBRARIES)
set(PDAL_HAVE_ZSTD 1)
endif(ZSTD_FOUND)
endif(WITH_ZSTD)

0 comments on commit f413e65

Please sign in to comment.