Skip to content

[vcpkg baseline][paraview] Fix linux build #12144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 19 commits into from
Jun 30, 2020
Merged

[vcpkg baseline][paraview] Fix linux build #12144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a5bf54a
[paraview] Fix linux build
Jun 29, 2020
c64feb9
re-trigger CI test
Jun 29, 2020
d451e93
[paraview] Set tools as a feature
Jun 29, 2020
3c2aa0c
Revert c64feb991c8350af4c187694b9d7d0b417fe0db7
Jun 29, 2020
386ff93
update baseline
Jun 29, 2020
a809f08
Add error message.
Jun 29, 2020
d06308f
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
8bda4cc
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
fd67044
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
197df96
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
9d6b123
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
d59b86c
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
5a9ed92
Update ports/paraview/portfile.cmake
JackBoosY Jun 29, 2020
acd847c
Remove duplicate fix-using-hdf5.patch.
BillyONeal Jun 29, 2020
6f8b91f
Add dependency embree3 on linux and test feature tools
Jun 30, 2020
f371969
remove default feature
Jun 30, 2020
5b082f1
update baseline
Jun 30, 2020
4894244
update baseline
Jun 30, 2020
f05103a
Add error message when building paraview[tools]:x64-osx
Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ports/paraview/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Source: paraview
Version: 5.8.0-1
Version: 5.8.0-2
Homepage: https://www.paraview.org/
Description: VTK-based Data Analysis and Visualization Application
Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm
Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm, embree3(linux)

Feature: vtkm
Description: enables vtkm for the build of paraview
Expand All @@ -20,6 +20,9 @@ Feature: mpi
Description: enables cuda within paraview
Build-Depends: hdf5[core,parallel], vtk[core, mpi]

Feature: tools
Description: Build paraview tools

Feature: all_modules
Description: enables the build of all paraview modules
Build-Depends: gdal, pdal, ffmpeg, laszip
15 changes: 15 additions & 0 deletions ports/paraview/add-tools-option.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b33b25..10cadda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -730,7 +730,10 @@ if (PARAVIEW_ENABLE_WEB)
@ONLY)
endif ()

+option(PARAVIEW_BUILD_TOOLS "Build paraview tools" OFF)
+if (PARAVIEW_BUILD_TOOLS)
add_subdirectory(Clients)
+endif()

if (PARAVIEW_USE_PYTHON)
add_subdirectory(Wrapping/Python)
105 changes: 0 additions & 105 deletions ports/paraview/fix-using-hdf5.patch
View file
Open in desktop

This file was deleted.

10 changes: 9 additions & 1 deletion ports/paraview/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
set(VERSION 5.8)

if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_OSX)
mesage(FATAL_ERROR "Feature tools are currently not supported.")
endif()

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"cuda" PARAVIEW_USE_CUDA #untested; probably only affects internal VTK build so it does nothing here
"all_modules" PARAVIEW_BUILD_ALL_MODULES #untested
"mpi" PARAVIEW_USE_MPI #untested
"vtkm" PARAVIEW_USE_VTKM
"python" PARAVIEW_USE_PYTHON
"tools" PARAVIEW_BUILD_TOOLS
)

vcpkg_from_github(
Expand All @@ -22,6 +27,7 @@ vcpkg_from_github(
qt_static_plugins.patch # Remove with Qt version > 5.14
python_include.patch
python_wrapper.patch
add-tools-option.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand All @@ -40,7 +46,6 @@ vcpkg_from_gitlab(
SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58
PATCHES
VisIt_Build.patch
fix-using-hdf5.patch
#removeunusedsymbols.patch # These also get remove in master of ParaView
${VisItPatches}
)
Expand All @@ -66,6 +71,9 @@ if("python" IN_LIST FEATURES)
#VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
endif()

string(APPEND VCPKG_C_FLAGS " -DH5_USE_110_API")
string(APPEND VCPKG_CXX_FLAGS " -DH5_USE_110_API")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,8 +1377,6 @@ pangomm:x64-osx=fail
pangomm:x64-windows=ignore
pangomm:x86-windows=ignore
pangomm:arm64-windows=fail
# Missing symbols will, probably fix itself with Qt >= 5.15
paraview:x64-osx=fail
parmetis:x64-linux=fail
parmetis:x64-osx=fail
pcre2:arm-uwp=fail
Expand Down