Commit f668b5b7 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'las-no-force-rpath'

d719b279 paraview, vtkonly: make las optional
e30758f5

 las: don't force @rpath usage on macOS
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Bob Obara's avatarBob Obara <bob.obara@kitware.com>
Merge-request: !745
parents 1ed528dc d719b279
Pipeline #222362 failed with stages
in 246 minutes and 25 seconds
......@@ -30,6 +30,9 @@ superbuild_apply_patch(las add-boost-include-dirs
superbuild_apply_patch(las allow-rpath
"Don't reject RPATH settings on Linux")
superbuild_apply_patch(las no-force-rpath
"Don't force @rpath usage on macOS")
# https://github.com/libLAS/libLAS/pull/174
superbuild_apply_patch(las boost-find-package
"Find Boost during find_package(liblas) for 1.70 support")
......
......@@ -49,13 +49,12 @@ superbuild_add_project(paraview
boost
freetype
gdal
las
png
qt5
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 hdf5 paraviewweb protobuf
cxx11 hdf5 paraviewweb protobuf las
python3
CMAKE_ARGS
-DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON
......@@ -86,7 +85,7 @@ superbuild_add_project(paraview
-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2:STRING=YES
-DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2:STRING=YES
-DPARAVIEW_ENABLE_GDAL:BOOL=ON
-DPARAVIEW_ENABLE_LAS:BOOL=ON
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
# CMB needs to specify external plugins so that we can let paraview
# properly install the plugins. So we sneakily force a variable that is an
......
diff -u -Nru5 libLAS-1.8.1/src/CMakeLists.txt libLAS-1.8.1.no-force-rpath/src/CMakeLists.txt
--- libLAS-1.8.1/src/CMakeLists.txt 2016-08-23 12:44:16.000000000 -0400
+++ libLAS-1.8.1.no-force-rpath/src/CMakeLists.txt 2021-04-02 10:47:17.711920434 -0400
@@ -238,11 +238,11 @@
set_target_properties(${LIBLAS_C_LIB_NAME}
PROPERTIES
VERSION "${LIBLAS_C_LIB_VERSION}"
SOVERSION "${LIBLAS_C_LIB_SOVERSION}")
-if (APPLE)
+if (APPLE AND NOT CMAKE_INSTALL_NAME_DIR)
set_target_properties(
${LIBLAS_C_LIB_NAME}
PROPERTIES
INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON)
set_target_properties(
......@@ -20,6 +20,11 @@ if (python_enabled)
set(vtkonly_python_req YES)
endif ()
set(vtkonly_las_req NO)
if (las_enabled)
set(vtkonly_las_req YES)
endif ()
set(vtk_dll_paths)
if (qt5_dllpath)
list(APPEND vtk_dll_paths
......@@ -37,12 +42,11 @@ superbuild_add_project(vtkonly
DEBUGGABLE
DEPENDS
gdal
las
png
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 freetype libarchive python python2 python3 qt5 hdf5
cxx11 freetype libarchive python python2 python3 qt5 hdf5 las
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DVTK_BUILD_TESTING:BOOL=OFF
......@@ -58,7 +62,7 @@ superbuild_add_project(vtkonly
-DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=${vtkonly_libarchive_req}
-DVTK_MODULE_ENABLE_VTK_GeovisCore:STRING=YES
-DVTK_MODULE_ENABLE_VTK_IOGDAL:STRING=YES
-DVTK_MODULE_ENABLE_VTK_IOLAS:STRING=YES
-DVTK_MODULE_ENABLE_VTK_IOLAS:STRING=${vtkonly_las_req}
-DVTK_MODULE_ENABLE_VTK_IOParallelExodus:STRING=YES
-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2:STRING=YES
-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2:STRING=YES
......
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