Commit b8887909 authored by Dan Lipsa's avatar Dan Lipsa Committed by Kitware Robot
Browse files

Merge topic 'add_las'

c240477c ParaView depends on las only on apple-unix
f91ecbcd Enable las only for apple-unix.
5d575110 Do not build OSGeo4W.
a27e8269 Use dynamic linking for boost on Windows
8e77ea5e Use libc++ symbols style for mac
baa26d83 Build only what is needed.
93ed1601 We do not need bzip2 in boost.
fe4101b1

 Additional boost libraries needed by libLAS
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !376
parents 1c15fdba c240477c
Pipeline #78808 canceled with stage
in 0 seconds
......@@ -78,6 +78,7 @@ function (superbuild_find_projects var)
genericio
libxml2
mxml
las
scipy)
if (NOT APPLE)
......@@ -254,9 +255,14 @@ function (superbuild_add_tests)
endfunction ()
set(boost_libraries
program_options
iostreams
filesystem
date_time
system
thread)
set(boost_extra_options
"-sNO_BZIP2=1")
list(APPEND superbuild_version_files
"${CMAKE_CURRENT_LIST_DIR}/versions.cmake")
......
......@@ -117,6 +117,7 @@ The following packages enable other features within ParaView:
* `adios`: Enable readers and writers for visualization data in the ADIOS
file format.
* `boxlib`: Enable reading the boxlib3D file format.
* `las`: Enable reading the LAS file format
* `cosmotools`: Enables Cosmo file format readers and related filters and
algorithms.
* `ffmpeg`: Video encoding library for macOS and Linux.
......
set(las_cmake_args
-DWITH_GDAL:BOOL=FALSE
-DBUILD_OSGEO4W:BOOL=OFF
-DWITH_GEOTIFF:BOOL=FALSE
-DWITH_LASZIP:BOOL=FALSE
-DWITH_TESTS:BOOL=FALSE
-DWITH_UTILITIES:BOOL=FALSE)
# las sets, on windows, different boost options than the default
if(WIN32 AND MSVC)
list(APPEND las_cmake_args -DBoost_USE_STATIC_LIBS:BOOL=FALSE)
endif()
superbuild_add_project(las
DEPENDS boost
CMAKE_ARGS
${las_cmake_args}
)
# this patch is commited upstream at 4dbc30a7e7e099cbe01a7c192ec19d231cc26894
superbuild_apply_patch(las respect-with-geotiff
"find_package GeoTIFF only if WITH_GEOTIFF")
superbuild_apply_patch(las enable-outside-boost-options
"Enable outside boost options")
if (APPLE)
superbuild_append_flags(cxx_flags "-stdlib=libc++" PROJECT_ONLY)
superbuild_append_flags(ld_flags "-stdlib=libc++" PROJECT_ONLY)
endif ()
From b7bb8cde2b874e888b3a1b40233e44c76593eee1 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Mon, 23 Oct 2017 17:37:33 -0400
Subject: [PATCH] Enable outside packages to set boost options.
---
CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82fc991a..032b5e49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,8 +190,12 @@ message(STATUS "Searching for Boost 1.38+ - done")
# on windows in the compilation documentation.
if(WIN32)
if (MSVC)
- set(Boost_USE_STATIC_LIBS ON)
- set(Boost_USE_MULTITHREADED ON)
+ if (NOT DEFINED Boost_USE_STATIC_LIBS)
+ set(Boost_USE_STATIC_LIBS ON)
+ endif()
+ if (NOT DEFINED Boost_USE_MULTITHREADED)
+ set(Boost_USE_MULTITHREADED ON)
+ endif()
endif(MSVC)
endif(WIN32)
--
2.11.0
From 4dbc30a7e7e099cbe01a7c192ec19d231cc26894 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Thu, 19 Oct 2017 12:54:03 -0400
Subject: [PATCH] find_package GeoTIFF only if WITH_GEOTIFF.
---
CMakeLists.txt | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18336e00..82fc991a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,8 +254,9 @@ endif()
# GeoTIFF support - required, default=ON
set(WITH_GEOTIFF TRUE CACHE BOOL "Choose if GeoTIFF support should be built")
-find_package (GeoTIFF 1.3.0 )
-if(GEOTIFF_FOUND)
+if(WITH_GEOTIFF)
+ find_package (GeoTIFF 1.3.0 )
+ if(GEOTIFF_FOUND)
set(WITH_GEOTIFF TRUE)
# Confirm required API is available
include(CheckFunctionExists)
@@ -265,7 +266,7 @@ if(GEOTIFF_FOUND)
mark_as_advanced(CLEAR TIFF_INCLUDE_DIR)
mark_as_advanced(CLEAR TIFF_LIBRARY)
if (WIN32)
- set(TIFF_NAMES libtiff_i)
+ set(TIFF_NAMES libtiff_i)
endif(WIN32)
find_package (TIFF QUIET NO_MODULE)
if (NOT TIFF_FOUND)
@@ -274,16 +275,17 @@ if(GEOTIFF_FOUND)
if (TIFF_FOUND)
include_directories(${TIFF_INCLUDE_DIR})
endif()
- find_package (JPEG NO_MODULE QUIET)
- if (NOT JPEG_FOUND)
- find_package (JPEG)
- endif ()
- find_package (ZLIB NO_MODULE QUIET)
- if (NOT ZLIB_FOUND)
- find_package (ZLIB)
- endif ()
-else()
+ find_package (JPEG NO_MODULE QUIET)
+ if (NOT JPEG_FOUND)
+ find_package (JPEG)
+ endif ()
+ find_package (ZLIB NO_MODULE QUIET)
+ if (NOT ZLIB_FOUND)
+ find_package (ZLIB)
+ endif ()
+ else()
message(FATAL_ERROR "Unable to find sufficient GeoTIFF")
+ endif()
endif()
--
2.11.0
......@@ -90,7 +90,7 @@ if (UNIX)
fontconfig)
endif ()
list(APPEND paraviews_platform_dependencies
adios ffmpeg libxml2 freetype
adios ffmpeg libxml2 freetype las
# For cosmotools
genericio cosmotools)
......@@ -133,6 +133,7 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_PYTHON:BOOL=${python_enabled}
-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled}
-DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled}
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
-DPARAVIEW_USE_OSPRAY:BOOL=${ospray_enabled}
-DPARAVIEW_USE_VISITBRIDGE:BOOL=${visitbridge_enabled}
......
......@@ -119,3 +119,7 @@ superbuild_set_revision(paraviewweblightviz
superbuild_set_revision(boxlib
URL "http://www.paraview.org/files/dependencies/boxlib-c114717e6c47188a0812804addcab61d7605ef89.tar.bz2"
URL_MD5 fb96e9b2c347c9b790d0eab4ba810e14)
superbuild_set_revision(las
URL "http://www.paraview.org/files/dependencies/libLAS-1.8.1.tar.bz2"
URL_MD5 2e6a975dafdf57f59a385ccb87eb5919)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment