Commit e0c0d24f authored by Dan Lipsa's avatar Dan Lipsa Committed by Kitware Robot

Merge topic 'build_las_windows'

c0339cc4 Disable boost autolinking.
c4575377 Add boost include dirs to libLAS include dirs
61c724ce Disable boost autolinking.
210e4d9d Enable LAS reader on windows.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !381
parents d4b88a9e c0339cc4
Pipeline #80313 canceled with stage
in 0 seconds
......@@ -61,6 +61,7 @@ function (superbuild_find_projects var)
pythonsetuptools
qt5
silo
las
szip
tbb
visitbridge
......@@ -79,7 +80,6 @@ function (superbuild_find_projects var)
genericio
libxml2
mxml
las
scipy)
if (NOT APPLE)
......
......@@ -16,6 +16,13 @@ superbuild_apply_patch(las respect-with-geotiff
superbuild_apply_patch(las enable-outside-boost-options
"Enable outside boost options")
superbuild_apply_patch(las add-boost-include-dirs
"Boost include dirs are needed on Windows")
if (WIN32)
superbuild_append_flags(cxx_flags "-DBOOST_ALL_NO_LIB" PROJECT_ONLY)
endif()
if (APPLE)
superbuild_append_flags(cxx_flags "-stdlib=libc++" PROJECT_ONLY)
superbuild_append_flags(ld_flags "-stdlib=libc++" PROJECT_ONLY)
......
......@@ -90,7 +90,7 @@ if (UNIX)
fontconfig)
endif ()
list(APPEND paraviews_platform_dependencies
adios ffmpeg libxml2 freetype las
adios ffmpeg libxml2 freetype
# For cosmotools
genericio cosmotools)
......@@ -112,7 +112,7 @@ superbuild_add_project(paraview
DEFAULT_ON
DEPENDS_OPTIONAL
cuda boost hdf5 matplotlib mpi numpy png
python qt5 visitbridge zlib silo
python qt5 visitbridge zlib silo las
xdmf3 ospray vrpn vtkm tbb netcdf
paraviewusersguide paraviewgettingstartedguide
paraviewtutorial paraviewtutorialdata paraviewweb
......@@ -216,6 +216,11 @@ if (paraview_SOURCE_SELECTION STREQUAL "5.3.0")
"Fix various issues with the VTKConfig.cmake (Part 1)")
endif ()
if (WIN32 AND las_enabled)
superbuild_append_flags(cxx_flags "-DBOOST_ALL_NO_LIB" PROJECT_ONLY)
endif()
if (APPLE)
superbuild_append_flags(cxx_flags "-stdlib=libc++" PROJECT_ONLY)
superbuild_append_flags(ld_flags "-stdlib=libc++" PROJECT_ONLY)
......
From 3ed911f1e589d592403d43c2bd478f605c3b72a2 Mon Sep 17 00:00:00 2001
From: Dan Lipsa <dan.lipsa@kitware.com>
Date: Mon, 6 Nov 2017 10:11:45 -0500
Subject: [PATCH] header.hpp includes boost/uuid/uuid.hpp
On Windows, boost headers are installed in
boost_1_59/boost/...
Boost headers are not found unless libLAS
specifies that it needs them.
---
cmake/liblas-config.cmake.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in
index 175e9974..a74031e4 100644
--- a/cmake/liblas-config.cmake.in
+++ b/cmake/liblas-config.cmake.in
@@ -21,6 +21,7 @@ set (libLAS_BINARY_DIRS "${PROJECT_ROOT_DIR}/bin")
include ("${_DIR}/liblas-depends.cmake")
if(WIN32)
+ list(APPEND libLAS_INCLUDE_DIRS @Boost_INCLUDE_DIRS@)
set (libLAS_LIBRARIES liblas liblas_c)
else()
set (libLAS_LIBRARIES las las_c)
--
2.11.0
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