early-access version 2853
This commit is contained in:
15
externals/vcpkg/ports/paraview/add-tools-option.patch
vendored
Executable file
15
externals/vcpkg/ports/paraview/add-tools-option.patch
vendored
Executable file
@@ -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)
|
||||
24
externals/vcpkg/ports/paraview/catalyst_install.patch
vendored
Executable file
24
externals/vcpkg/ports/paraview/catalyst_install.patch
vendored
Executable file
@@ -0,0 +1,24 @@
|
||||
diff --git a/Clients/InSitu/CMakeLists.txt b/Clients/InSitu/CMakeLists.txt
|
||||
index 159aa8ffc..f9bfc7dfe 100644
|
||||
--- a/Clients/InSitu/CMakeLists.txt
|
||||
+++ b/Clients/InSitu/CMakeLists.txt
|
||||
@@ -86,5 +86,5 @@ _vtk_module_apply_properties(catalyst)
|
||||
# Update install locations
|
||||
catalyst_library(
|
||||
TARGET catalyst
|
||||
- LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}"
|
||||
+ #LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}"
|
||||
INSTALL_EXPORT_DEFAULT)
|
||||
diff --git a/Remoting/Views/vtkGeometryRepresentationInternal.h b/Remoting/Views/vtkGeometryRepresentationInternal.h
|
||||
index 86eb383af..cc204fba2 100644
|
||||
--- a/Remoting/Views/vtkGeometryRepresentationInternal.h
|
||||
+++ b/Remoting/Views/vtkGeometryRepresentationInternal.h
|
||||
@@ -22,7 +22,7 @@
|
||||
// serial backend.
|
||||
#ifndef __VTK_WRAP__
|
||||
#if VTK_MODULE_ENABLE_VTK_vtkm
|
||||
-#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB
|
||||
+//#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB
|
||||
#endif
|
||||
|
||||
#if defined(VTKM_ENABLE_TBB) && VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters
|
||||
29
externals/vcpkg/ports/paraview/cgns.patch
vendored
Executable file
29
externals/vcpkg/ports/paraview/cgns.patch
vendored
Executable file
@@ -0,0 +1,29 @@
|
||||
diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake
|
||||
index 005f1afd9..a45103a9f 100644
|
||||
--- a/CMake/FindCGNS.cmake
|
||||
+++ b/CMake/FindCGNS.cmake
|
||||
@@ -16,7 +16,7 @@ mark_as_advanced(CGNS_INCLUDE_DIR)
|
||||
|
||||
find_library(CGNS_LIBRARY
|
||||
NAMES
|
||||
- cgns
|
||||
+ cgnsdll cgns
|
||||
DOC "CGNS library")
|
||||
mark_as_advanced(CGNS_LIBRARY)
|
||||
|
||||
@@ -45,4 +45,15 @@ if (CGNS_FOUND)
|
||||
IMPORTED_LOCATION "${CGNS_LIBRARY}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}")
|
||||
endif ()
|
||||
+ include(CMakeFindDependencyMacro)
|
||||
+ find_dependency(hdf5 CONFIG)
|
||||
+ if(TARGET hdf5::hdf5-shared)
|
||||
+ set_property(TARGET CGNS::CGNS APPEND PROPERTY
|
||||
+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared")
|
||||
+ elseif(TARGET hdf5::hdf5-static)
|
||||
+ set_property(TARGET CGNS::CGNS APPEND PROPERTY
|
||||
+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static")
|
||||
+ else()
|
||||
+ message(FATAL_ERROR "No HDF5 target to link cgns against")
|
||||
+ endif()
|
||||
endif ()
|
||||
150
externals/vcpkg/ports/paraview/external_vtk.patch
vendored
Executable file
150
externals/vcpkg/ports/paraview/external_vtk.patch
vendored
Executable file
@@ -0,0 +1,150 @@
|
||||
diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
|
||||
index b0dea2b32..b035a9dc3 100644
|
||||
--- a/CMake/ParaViewClient.cmake
|
||||
+++ b/CMake/ParaViewClient.cmake
|
||||
@@ -516,6 +516,7 @@ function (paraview_client_documentation)
|
||||
NAMES xmlpatterns-qt5 xmlpatterns
|
||||
HINTS "${Qt5_DIR}/../../../bin"
|
||||
"${Qt5_DIR}/../../../libexec/qt5/bin"
|
||||
+ "${Qt5_DIR}/../../../tools/qt5/bin"
|
||||
DOC "Path to xmlpatterns")
|
||||
mark_as_advanced(qt_xmlpatterns_executable)
|
||||
|
||||
diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
|
||||
index f544a7c06..c51278931 100644
|
||||
--- a/CMake/ParaViewOptions.cmake
|
||||
+++ b/CMake/ParaViewOptions.cmake
|
||||
@@ -88,7 +88,7 @@ endif()
|
||||
#========================================================================
|
||||
|
||||
# XXX(VTK): External VTK is not yet actually supported.
|
||||
-if (FALSE)
|
||||
+if (TRUE)
|
||||
option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF)
|
||||
mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK)
|
||||
else ()
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1af77d164..bebcb83ee 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -72,7 +72,8 @@ if (NOT CMAKE_INSTALL_LICENSEDIR)
|
||||
endif ()
|
||||
|
||||
set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
|
||||
-set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
|
||||
+set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk")
|
||||
+message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}")
|
||||
if (NOT IS_DIRECTORY "${vtk_cmake_dir}")
|
||||
message(FATAL_ERROR
|
||||
"Failed to find the VTK CMake directory. Did you forget to initialize the "
|
||||
@@ -383,9 +384,73 @@ endif ()
|
||||
|
||||
if (PARAVIEW_USE_EXTERNAL_VTK)
|
||||
if (paraview_required_modules OR paraview_unrecognized_modules)
|
||||
- message(FATAL_ERROR
|
||||
- "The following modules were requested or required, but not found: "
|
||||
- "${paraview_required_modules};${paraview_unrecognized_modules}.")
|
||||
+ message(STATUS "REQUIRED:${paraview_required_modules}")
|
||||
+ foreach(mod ${paraview_required_modules})
|
||||
+ if(NOT TARGET ${mod})
|
||||
+ message(STATUS "REQUIRED TARGET not defined: ${mod}")
|
||||
+ list(APPEND modules_notarget ${mod})
|
||||
+ endif()
|
||||
+ if(${mod} MATCHES "VTK::") # For better debugging
|
||||
+ message(STATUS "VTK TARGET found: ${mod}")
|
||||
+ list(APPEND vtk_modules ${mod})
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ foreach(mod ${paraview_unrecognized_modules})
|
||||
+ if(NOT TARGET ${mod})
|
||||
+ message(STATUS "UNREC TARGET not defined: ${mod}")
|
||||
+ list(FIND paraview_rejected_modules ${mod} _found_mod)
|
||||
+ if(_found_mod GREATER_EQUAL 0)
|
||||
+ message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized")
|
||||
+ list(APPEND _to_remove ${mod})
|
||||
+ endif()
|
||||
+ else()
|
||||
+ list(APPEND _to_remove ${mod})
|
||||
+ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
|
||||
+ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
|
||||
+ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}")
|
||||
+ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}")
|
||||
+ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}")
|
||||
+ set(_unnecessary_moduls ${paraview_modules})
|
||||
+ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules})
|
||||
+ message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}")
|
||||
+ if(modules_notarget)
|
||||
+ message(FATAL_ERROR
|
||||
+ "The following modules were requested or required, but not found: "
|
||||
+ "${modules_notarget}")
|
||||
+ endif()
|
||||
+ list(REMOVE_DUPLICATES vtk_modules)
|
||||
+ macro(search_dependent_targets)
|
||||
+ set(vtk_mod_dep_list)
|
||||
+ foreach(vtk_targ ${ARGN})
|
||||
+ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends")
|
||||
+ if(vtk_mod_dep)
|
||||
+ list(APPEND vtk_mod_dep_list ${vtk_mod_dep})
|
||||
+ endif()
|
||||
+ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends")
|
||||
+ if(vtk_mod_pdep)
|
||||
+ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep})
|
||||
+ endif()
|
||||
+ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends")
|
||||
+ if(vtk_mod_odep)
|
||||
+ list(APPEND vtk_mod_dep_list ${vtk_mod_odep})
|
||||
+ endif()
|
||||
+ if(vtk_mod_dep_list)
|
||||
+ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}")
|
||||
+ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules})
|
||||
+ if(vtk_mod_dep_list)
|
||||
+ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}")
|
||||
+ list(APPEND vtk_modules ${vtk_mod_dep_list})
|
||||
+ search_dependent_targets(${vtk_mod_dep_list})
|
||||
+ else()
|
||||
+ message(STATUS "No new modules discovered!")
|
||||
+ endif()
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ endmacro()
|
||||
+ search_dependent_targets(${vtk_modules})
|
||||
endif ()
|
||||
|
||||
if (PARAVIEW_USE_PYTHON)
|
||||
@@ -459,7 +524,7 @@ else ()
|
||||
endif()
|
||||
|
||||
# Set up these variables now so that modules may acess them
|
||||
- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES)
|
||||
+ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
|
||||
set(vtk_cmake_dir
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
|
||||
set(vtk_cmake_destination
|
||||
@@ -558,6 +623,9 @@ set(_paraview_add_tests_default_data_directory
|
||||
set(_paraview_add_tests_default_test_data_target
|
||||
"ParaViewData")
|
||||
|
||||
+list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere
|
||||
+list(REMOVE_DUPLICATES paraview_modules) # probably not needed
|
||||
+
|
||||
vtk_module_build(
|
||||
MODULES ${paraview_modules}
|
||||
KITS ${paraview_kits}
|
||||
@@ -596,9 +664,11 @@ vtk_module_build(
|
||||
TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}")
|
||||
|
||||
include(vtkModuleJson)
|
||||
-vtk_module_json(
|
||||
- MODULES ${vtk_modules}
|
||||
- OUTPUT "vtk-modules.json")
|
||||
+if(NOT PARAVIEW_USE_EXTERNAL_VTK)
|
||||
+ vtk_module_json(
|
||||
+ MODULES ${vtk_modules}
|
||||
+ OUTPUT "vtk-modules.json")
|
||||
+endif()
|
||||
vtk_module_json(
|
||||
MODULES ${paraview_modules}
|
||||
OUTPUT "paraview-modules.json")
|
||||
189
externals/vcpkg/ports/paraview/portfile.cmake
vendored
Executable file
189
externals/vcpkg/ports/paraview/portfile.cmake
vendored
Executable file
@@ -0,0 +1,189 @@
|
||||
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json)
|
||||
string(JSON _ver_string GET "${_vcpkg_json}" "version")
|
||||
string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}")
|
||||
|
||||
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(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Kitware/ParaView
|
||||
REF aad4b6f1e92154879209102edfab8367f1e7d191 # v5.9.1
|
||||
SHA512 330fcb8525bdee9b02e06f05d4e91cc4d631d03df99c30f82bb97da5e06b5a2a6ff4ecee807b6f6c7110d2f53db1c17e4670d6078ae1cc89cfd7089b67d05bdb
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
external_vtk.patch
|
||||
cgns.patch
|
||||
python_include.patch
|
||||
python_wrapper.patch
|
||||
add-tools-option.patch
|
||||
catalyst_install.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
list(APPEND VisItPatches removedoublesymbols.patch)
|
||||
endif()
|
||||
|
||||
#The following two dependencies should probably be their own port
|
||||
#but require additional patching in paraview to make it work.
|
||||
|
||||
#Get VisItBridge Plugin
|
||||
vcpkg_from_gitlab(
|
||||
OUT_SOURCE_PATH VISITIT_SOURCE_PATH
|
||||
GITLAB_URL https://gitlab.kitware.com/
|
||||
REPO paraview/visitbridge
|
||||
REF 42fce8ad6863ca2c1308741955cca1d0cf570d22
|
||||
SHA512 03a6254989d3e286a462683af92caba1e90decbdcfb2e729f2d7e1116b04d63a05c28d02c4615d780fdd0d33e2719f96617233d6e0602410cc6d894f92fe6ee3
|
||||
PATCHES
|
||||
${VisItPatches}
|
||||
)
|
||||
#Get QtTesting Plugin
|
||||
vcpkg_from_gitlab(
|
||||
OUT_SOURCE_PATH QTTESTING_SOURCE_PATH
|
||||
GITLAB_URL https://gitlab.kitware.com/
|
||||
REPO paraview/qttesting
|
||||
REF 72290689c7c55622d729bf95c97e7627026a234e
|
||||
SHA512 fb18c6745b784b294f01d5391ba4cdcaa109443a193eb35fbf1553fdb3a4f7217f784fd4893fab72784cec5bd3fc821bf1e766e943d0f562c5917788800599b0
|
||||
)
|
||||
|
||||
#Get Catalyst
|
||||
vcpkg_from_gitlab(
|
||||
OUT_SOURCE_PATH CATALYST_SOURCE_PATH
|
||||
GITLAB_URL https://gitlab.kitware.com/
|
||||
REPO paraview/catalyst
|
||||
REF e36e4a5f3c67011c97c335cce23d2bc3abc0d086
|
||||
SHA512 9926c272ab8785997f9c98cfaf696943081b0ddb0e9e343602722671b6f3eaef5b8de5dd049ca783b6844c7e328a96e1b09c8b24c16f001eeeed2d154d290480
|
||||
)
|
||||
|
||||
|
||||
file(COPY "${VISITIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/Utilities/VisItBridge")
|
||||
file(COPY "${QTTESTING_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting")
|
||||
file(COPY "${CATALYST_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst")
|
||||
|
||||
if("python" IN_LIST FEATURES)
|
||||
vcpkg_find_acquire_program(PYTHON3)
|
||||
list(APPEND ADDITIONAL_OPTIONS
|
||||
-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()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON
|
||||
-DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON
|
||||
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
|
||||
-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)
|
||||
# ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files
|
||||
set(BACKUP_LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH})
|
||||
set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}:${CURRENT_INSTALLED_DIR}/lib")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_install(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools
|
||||
|
||||
if(CMAKE_HOST_UNIX)
|
||||
set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION})
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
# see https://gitlab.kitware.com/paraview/paraview/-/issues/21328
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h")
|
||||
|
||||
set(TOOLVER pv${VERSION})
|
||||
set(TOOLS paraview
|
||||
pvbatch
|
||||
pvdataserver
|
||||
pvpython
|
||||
pvrenderserver
|
||||
pvserver
|
||||
smTestDriver
|
||||
vtkProcessXML
|
||||
vtkWrapClientServer)
|
||||
|
||||
foreach(tool ${TOOLS})
|
||||
# Remove debug tools
|
||||
set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
||||
if(EXISTS ${filename})
|
||||
file(REMOVE "${filename}")
|
||||
endif()
|
||||
set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
||||
if(EXISTS ${filename})
|
||||
file(REMOVE "${filename}")
|
||||
endif()
|
||||
set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}d${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
||||
if(EXISTS ${filename})
|
||||
file(REMOVE "${filename}")
|
||||
endif()
|
||||
|
||||
# Move release tools
|
||||
set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
||||
if(EXISTS ${filename})
|
||||
file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
file(REMOVE "${filename}")
|
||||
endif()
|
||||
set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
||||
if(EXISTS ${filename})
|
||||
file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
file(REMOVE "${filename}")
|
||||
endif()
|
||||
endforeach()
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
||||
|
||||
# # Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one?
|
||||
file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
macro(move_bin_to_lib name)
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${name})
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${name}" "${CURRENT_PACKAGES_DIR}/lib/${name}")
|
||||
endif()
|
||||
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin/${name})
|
||||
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${name}" "${CURRENT_PACKAGES_DIR}/debug/lib/${name}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
set(to_move Lib paraview-${VERSION} paraview-config)
|
||||
foreach(name ${to_move})
|
||||
move_bin_to_lib(${name})
|
||||
endforeach()
|
||||
|
||||
file(GLOB_RECURSE cmake_files ${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake)
|
||||
foreach(cmake_file ${cmake_files})
|
||||
file(READ "${cmake_file}" _contents)
|
||||
STRING(REPLACE "bin/" "lib/" _contents "${_contents}")
|
||||
file(WRITE "${cmake_file}" "${_contents}")
|
||||
endforeach()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
# The plugins also work without these files
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf")
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf")
|
||||
13
externals/vcpkg/ports/paraview/python_include.patch
vendored
Executable file
13
externals/vcpkg/ports/paraview/python_include.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
|
||||
index 0ecb928e9..5b5459a37 100644
|
||||
--- a/CMake/ParaViewOptions.cmake
|
||||
+++ b/CMake/ParaViewOptions.cmake
|
||||
@@ -136,7 +136,7 @@ option(PARAVIEW_ENABLE_RAYTRACING "Build ParaView with OSPray and/or OptiX ray-t
|
||||
|
||||
set(paraview_web_default ON)
|
||||
if (PARAVIEW_USE_PYTHON AND WIN32)
|
||||
- include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake")
|
||||
+ include(FindPythonModules)
|
||||
find_python_module(win32api have_pywin32)
|
||||
set(paraview_web_default "${have_pywin32}")
|
||||
endif ()
|
||||
19
externals/vcpkg/ports/paraview/python_wrapper.patch
vendored
Executable file
19
externals/vcpkg/ports/paraview/python_wrapper.patch
vendored
Executable file
@@ -0,0 +1,19 @@
|
||||
diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake
|
||||
index 3804a24e2..91fdd593a 100644
|
||||
--- a/CMake/vtkModuleWrapClientServer.cmake
|
||||
+++ b/CMake/vtkModuleWrapClientServer.cmake
|
||||
@@ -37,10 +37,13 @@ function (_vtk_module_wrap_client_server_sources module sources classes)
|
||||
"$<TARGET_PROPERTY:${_vtk_client_server_target_name},COMPILE_DEFINITIONS>")
|
||||
set(_vtk_client_server_genex_include_directories
|
||||
"$<TARGET_PROPERTY:${_vtk_client_server_target_name},INCLUDE_DIRECTORIES>")
|
||||
+ set(_vtk_client_server_genex_interface_include_directories
|
||||
+ "$<TARGET_PROPERTY:${_vtk_client_server_target_name},INTERFACE_INCLUDE_DIRECTORIES>")
|
||||
file(GENERATE
|
||||
OUTPUT "${_vtk_client_server_args_file}"
|
||||
CONTENT "$<$<BOOL:${_vtk_client_server_genex_compile_definitions}>:\n-D\'$<JOIN:${_vtk_client_server_genex_compile_definitions},\'\n-D\'>\'>\n
|
||||
-$<$<BOOL:${_vtk_client_server_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_client_server_genex_include_directories},\'\n-I\'>\'>\n")
|
||||
+ $<$<BOOL:${_vtk_client_server_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_client_server_genex_include_directories},\'\n-I\'>\'>\n
|
||||
+ $<$<BOOL:${_vtk_client_server_genex_interface_include_directories}>:\n-I\'$<JOIN:${_vtk_client_server_genex_interface_include_directories},\'\n-I\'>\'>\n")
|
||||
|
||||
_vtk_module_get_module_property("${module}"
|
||||
PROPERTY "hierarchy"
|
||||
89
externals/vcpkg/ports/paraview/removedoublesymbols.patch
vendored
Executable file
89
externals/vcpkg/ports/paraview/removedoublesymbols.patch
vendored
Executable file
@@ -0,0 +1,89 @@
|
||||
diff --git a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C
|
||||
index db64a0534..0d987d8e7 100644
|
||||
--- a/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C
|
||||
+++ b/Library/VisItLib/visit_vtk/lightweight/vtkUnstructuredGridFacelistFilter.C
|
||||
@@ -69,7 +69,10 @@
|
||||
//
|
||||
// Forward declare some of types used to hash faces.
|
||||
//
|
||||
-class Quad;
|
||||
+namespace hidden {
|
||||
+ class Quad;
|
||||
+}
|
||||
+using hidden::Quad;
|
||||
class QuadMemoryManager;
|
||||
class Tri;
|
||||
class TriMemoryManager;
|
||||
@@ -322,43 +325,43 @@ class HashEntryList
|
||||
// Creation: October 21, 2002
|
||||
//
|
||||
// ****************************************************************************
|
||||
+namespace hidden {
|
||||
+ class Quad
|
||||
+ {
|
||||
+ friend class Tri;
|
||||
|
||||
-class Quad
|
||||
-{
|
||||
- friend class Tri;
|
||||
-
|
||||
- public:
|
||||
- Quad() { ordering_case = 255; };
|
||||
-
|
||||
- vtkIdType AssignNodes(const vtkIdType *);
|
||||
- bool Equals(Quad *);
|
||||
- bool Equals(Tri *);
|
||||
- void AddInRemainingTriangle(Tri *, int);
|
||||
- inline void ReRegisterMemory(void)
|
||||
- {
|
||||
- hashEntryList->qmm.ReRegisterQuad(this);
|
||||
- }
|
||||
+ public:
|
||||
+ Quad() { ordering_case = 255; };
|
||||
|
||||
- inline void SetOriginalZone(const int &oz) { orig_zone = oz; };
|
||||
- inline int GetOriginalZone(void) { return orig_zone; };
|
||||
+ vtkIdType AssignNodes(const vtkIdType *);
|
||||
+ bool Equals(Quad *);
|
||||
+ bool Equals(Tri *);
|
||||
+ void AddInRemainingTriangle(Tri *, int);
|
||||
+ inline void ReRegisterMemory(void)
|
||||
+ {
|
||||
+ hashEntryList->qmm.ReRegisterQuad(this);
|
||||
+ }
|
||||
|
||||
- void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *);
|
||||
+ inline void SetOriginalZone(const int &oz) { orig_zone = oz; };
|
||||
+ inline int GetOriginalZone(void) { return orig_zone; };
|
||||
|
||||
- inline void RegisterHashEntryList(HashEntryList *hel)
|
||||
- { hashEntryList = hel; };
|
||||
- inline void SetNumberOfPoints(int np) { npts = np; };
|
||||
+ void OutputCell(int,vtkPolyData *, vtkCellData *, vtkCellData *);
|
||||
|
||||
- protected:
|
||||
- unsigned char ordering_case;
|
||||
- vtkIdType nodes[3];
|
||||
- vtkIdType orig_zone;
|
||||
+ inline void RegisterHashEntryList(HashEntryList *hel)
|
||||
+ { hashEntryList = hel; };
|
||||
+ inline void SetNumberOfPoints(int np) { npts = np; };
|
||||
|
||||
- HashEntryList *hashEntryList;
|
||||
- int npts;
|
||||
+ protected:
|
||||
+ unsigned char ordering_case;
|
||||
+ vtkIdType nodes[3];
|
||||
+ vtkIdType orig_zone;
|
||||
|
||||
- void AddInRemainingTriangle(int, int);
|
||||
-};
|
||||
+ HashEntryList *hashEntryList;
|
||||
+ int npts;
|
||||
|
||||
+ void AddInRemainingTriangle(int, int);
|
||||
+ };
|
||||
+}
|
||||
//
|
||||
// We will be re-ordering the nodes into numerical order. This enumerated
|
||||
// type will allow the ordering to be preserved.
|
||||
100
externals/vcpkg/ports/paraview/vcpkg.json
vendored
Executable file
100
externals/vcpkg/ports/paraview/vcpkg.json
vendored
Executable file
@@ -0,0 +1,100 @@
|
||||
{
|
||||
"name": "paraview",
|
||||
"version": "5.9.1",
|
||||
"port-version": 2,
|
||||
"description": "VTK-based Data Analysis and Visualization Application",
|
||||
"homepage": "https://www.paraview.org/",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": [
|
||||
"boost-algorithm",
|
||||
"boost-core",
|
||||
"boost-format",
|
||||
"cgns",
|
||||
"protobuf",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"paraview"
|
||||
]
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
"all-modules": {
|
||||
"description": "enables the build of all paraview modules",
|
||||
"dependencies": [
|
||||
"ffmpeg",
|
||||
"gdal",
|
||||
"laszip",
|
||||
"pdal"
|
||||
]
|
||||
},
|
||||
"cuda": {
|
||||
"description": "enables cuda within paraview",
|
||||
"dependencies": [
|
||||
"cuda",
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"cuda"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"mpi": {
|
||||
"description": "enables cuda within paraview",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "hdf5",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"parallel"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"mpi"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"python": {
|
||||
"description": "enables the build of python wrappers",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"python"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"tools": {
|
||||
"description": "Build paraview tools"
|
||||
},
|
||||
"vtkm": {
|
||||
"description": "enables vtkm for the build of paraview",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vtk",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"vtkm"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user