diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-01 22:48:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 13:48:24 -0700 |
| commit | f7fe9e374fa85103e144972d0d9a2dc368d8f66f (patch) | |
| tree | ac414a9b220636e5d8fb779b63697141f1951070 /ports/paraview | |
| parent | f7dcd675d08f7a6974893e592e2aee0b7c318bb0 (diff) | |
| download | vcpkg-f7fe9e374fa85103e144972d0d9a2dc368d8f66f.tar.gz vcpkg-f7fe9e374fa85103e144972d0d9a2dc368d8f66f.zip | |
[qt5-base] Add zstd as a dependency (#12342)
* [qt5-base] add hidden optional not switchable zstd dependency.
* [netcdf/paraview] correct embree3 dependency
[paraview] make tools default feature for CI testing.
* [paraview] fix typo and remove unnecessary flags
* [paraview] add flags back into portfile
* [vtk] add hdf5 api patch
[paraview] remove hdf5 use flags from portfile
[field3d] use flags instead of patching to fix hdf5.
* [paraview] remove message on osx since it now works with qt 5.15
* [paraview] remove default feature and force CI features by a CI test port
* [paraview|CI] back out python from CI testing for now
* [qt5-base] add in the macos deployment target fix
Diffstat (limited to 'ports/paraview')
| -rw-r--r-- | ports/paraview/CONTROL | 5 | ||||
| -rw-r--r-- | ports/paraview/portfile.cmake | 16 |
2 files changed, 7 insertions, 14 deletions
diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index 56aa3cbaa..d40b55adc 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -1,8 +1,9 @@ Source: paraview
-Version: 5.8.0-2
+Version: 5.8.0
+Port-Version: 3
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, embree3(linux)
+Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm
Feature: vtkm
Description: enables vtkm for the build of paraview
diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 84f1d1aab..ab64ef34a 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -1,9 +1,5 @@ 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
@@ -65,13 +61,9 @@ if("python" IN_LIST FEATURES) -DPython3_FIND_REGISTRY=NEVER
"-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature
)
-
#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
@@ -82,15 +74,15 @@ vcpkg_configure_cmake( -DVTK_MODULE_ENABLE_ParaView_qttesting=YES
-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF
-DPARAVIEW_USE_QTHELP:BOOL=OFF
-
+
#A little bit of help in finding the boost headers
"-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include"
-
+
# Workarounds for CMake issues
-DHAVE_SYS_TYPES_H=0 ## For some strange reason the test first succeeds and then fails the second time around
-DWORDS_BIGENDIAN=0 ## Tests fails in VisItCommon.cmake for some unknown reason this is just a workaround since most systems are little endian.
${ADDITIONAL_OPTIONS}
-
+
#-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
)
if(CMAKE_HOST_UNIX)
@@ -120,7 +112,7 @@ set(TOOLS paraview smTestDriver
vtkProcessXML
vtkWrapClientServer)
-
+
foreach(tool ${TOOLS})
# Remove debug tools
set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|