mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:49:00 +08:00
9e36a44338
* [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version * commit stuff * commit stuff * update notes * wip commit * update paraview * fix hdf5 patch * fix patch * fix patch * fix portfile * add mpi feature * format manifest * use relativ path * trace * retry * move qml files again * try with host triplet * - use VCPKG_CRT_LINKAGE - use METIS not metis * fix casing Zlib * hopefully more fixes on other platforms. * fix patch * fix missing ws * fix typos * scale down to warning * revert jsoncpp change fix zoltan on osx? * move trace option to failing port * move trace option to failing port * Revert "trilinos vcpkg.json changes" * verdict fix osx build ? * fix patch * fix internal find_package call * also apply correct case for metis * disable METIS on osx * vtk-m don't support arm. * force more features in Ci * fix missing , * more fixes * more vtk python try and error. * - paraview python setup same as vtk - remove openvr from platforms not supporting it - trace openimageio * fix case and remove fmt for openimageio. * trying to fix stuff * set hash to 0 * [skip actions] add missing module * WebCore module moved to paraview&python * fixes * remove patch in vtk-dicom * add var to maybe unused * use correct 5.11 ref instead of the one in release * Patch cleanup round 1 * remove empty patch parts * fix vtkm configs * reintegrate jsoncpp.patch * fix patch * add single seacas/kokkos/zoltan ports * throw out trilinos, zoltan, kokkos replace trilinos with seacas make seacas work for dynamic windows * fix mpi feature * fix dependency * retry dep fix * rename target * remove double line * fix target * fix patch * retry * remove cgns config * fix cgns * no seacas trace * lowercase hdf5 target * fix case of metis * disable Fortran * add iotr patch * add additional config folder * handel case sensitive Seacas again * get trace again and force jsoncpp * update cmake to 3.25.0 * bump port-version * add patch from vtk upstream * cleanup, format-manifest * fix port version * v db * opencv4 always inject deps. * fix test port to not require stuff which is not supported on x86 * Fix HDF5 lookup in opencv4 * only delete bin folder in static builds * add license field * v db * add missing " * v db * trace again * fix rtabmap python dep * fix openimageio by deleting the find module * v db * cr cleanup * v db * opencv4 v db due to merge with master. Had to bump port version * v db * v db * v db * CR comments * v db for cr comments * trace theia output * revert theia trace * v db * try without patch * revert rtabmap changes * v db after merge * v db for all
154 lines
5.3 KiB
Diff
154 lines
5.3 KiB
Diff
diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMakeLists.txt
|
|
index 397dca9f6..bc9c62ac5 100644
|
|
--- a/Accelerators/Vtkm/Core/CMakeLists.txt
|
|
+++ b/Accelerators/Vtkm/Core/CMakeLists.txt
|
|
@@ -16,8 +16,7 @@
|
|
|
|
set(VTKm_NO_DEPRECATED_VIRTUAL ON)
|
|
|
|
-list(INSERT CMAKE_MODULE_PATH 0
|
|
- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
|
|
+find_package(VTKm CONFIG REQUIRED)
|
|
|
|
set(private_headers
|
|
vtkmFilterPolicy.h
|
|
@@ -65,9 +64,6 @@ vtkm_add_target_information(${vtkm_accel_target}
|
|
EXTENDS_VTKM
|
|
MODIFY_CUDA_FLAGS
|
|
DEVICE_SOURCES ${sources})
|
|
-vtk_module_set_property(VTK::AcceleratorsVTKmCore
|
|
- PROPERTY JOB_POOL_COMPILE
|
|
- VALUE vtkm_pool)
|
|
|
|
if (TARGET vtkm::kokkos_hip)
|
|
list(TRANSFORM nowrap_classes APPEND ".cxx" OUTPUT_VARIABLE hip_impl)
|
|
diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt
|
|
index 9d5dfe100..7fea257b7 100644
|
|
--- a/Accelerators/Vtkm/DataModel/CMakeLists.txt
|
|
+++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt
|
|
@@ -16,8 +16,7 @@
|
|
|
|
set(VTKm_NO_DEPRECATED_VIRTUAL ON)
|
|
|
|
-list(INSERT CMAKE_MODULE_PATH 0
|
|
- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
|
|
+find_package(VTKm CONFIG REQUIRED)
|
|
|
|
set(sources
|
|
vtkmlib/ArrayConvertersReal.cxx
|
|
@@ -72,10 +71,6 @@ vtkm_add_target_information(${vtkm_accel_target}
|
|
MODIFY_CUDA_FLAGS
|
|
DEVICE_SOURCES ${sources})
|
|
|
|
-vtk_module_set_property(VTK::AcceleratorsVTKmDataModel
|
|
- PROPERTY JOB_POOL_COMPILE
|
|
- VALUE vtkm_pool)
|
|
-
|
|
if (TARGET vtkm::cuda)
|
|
set(cuda_impl ${nowrap_classes} vtkmDataSet.cxx)
|
|
set_source_files_properties(${cuda_impl} PROPERTIES
|
|
diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt
|
|
index 0f51c436d..567b49197 100644
|
|
--- a/Accelerators/Vtkm/Filters/CMakeLists.txt
|
|
+++ b/Accelerators/Vtkm/Filters/CMakeLists.txt
|
|
@@ -16,8 +16,7 @@
|
|
|
|
set(VTKm_NO_DEPRECATED_VIRTUAL ON)
|
|
|
|
-list(INSERT CMAKE_MODULE_PATH 0
|
|
- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake")
|
|
+find_package(VTKm CONFIG REQUIRED)
|
|
|
|
set(classes
|
|
vtkmAverageToCells
|
|
@@ -118,9 +117,6 @@ vtkm_add_target_information(${vtkm_accel_target}
|
|
MODIFY_CUDA_FLAGS
|
|
DEVICE_SOURCES ${sources})
|
|
|
|
-vtk_module_set_property(VTK::AcceleratorsVTKmFilters
|
|
- PROPERTY JOB_POOL_COMPILE
|
|
- VALUE vtkm_pool)
|
|
vtk_module_link(VTK::AcceleratorsVTKmFilters
|
|
PRIVATE
|
|
vtkm_worklet
|
|
diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in
|
|
index a8c40085a..764298f0e 100644
|
|
--- a/CMake/vtk-config.cmake.in
|
|
+++ b/CMake/vtk-config.cmake.in
|
|
@@ -126,9 +126,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@")
|
|
unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND")
|
|
set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@")
|
|
if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm)
|
|
- find_package(VTKm
|
|
- PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm"
|
|
- NO_DEFAULT_PATH)
|
|
+ find_package(VTKm CONFIG REQUIRED)
|
|
if (NOT VTKm_FOUND)
|
|
set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0)
|
|
endif ()
|
|
diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt
|
|
index 8cfbf92b0..ad78cc8f5 100644
|
|
--- a/ThirdParty/vtkm/CMakeLists.txt
|
|
+++ b/ThirdParty/vtkm/CMakeLists.txt
|
|
@@ -1,6 +1,41 @@
|
|
-vtk_module_third_party_internal(
|
|
- LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt"
|
|
- VERSION "1.7.1"
|
|
- SUBDIRECTORY vtkvtkm
|
|
- STANDARD_INCLUDE_DIRS
|
|
- INTERFACE)
|
|
+#vtk_module_third_party_internal(
|
|
+# LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt"
|
|
+# VERSION "master"
|
|
+# SUBDIRECTORY vtkvtkm
|
|
+# STANDARD_INCLUDE_DIRS
|
|
+# INTERFACE)
|
|
+
|
|
+message(STATUS "VTK_MODULE_USE_EXTERNAL_VTK_vtkm: ${VTK_MODULE_USE_EXTERNAL_VTK_vtkm}")
|
|
+if(TRUE)
|
|
+ message(STATUS "Searching for external VTKm")
|
|
+ find_package(VTKm CONFIG REQUIRED)
|
|
+ if(TARGET vtkm_compiler_flags)
|
|
+ get_target_property(VTKm_INCLUDE_DIRS vtkm_compiler_flags INTERFACE_INCLUDE_DIRECTORIES)
|
|
+ message(STATUS "INCLUDE: ${VTKm_INCLUDE_DIRS}")
|
|
+ get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm_diy INTERFACE_INCLUDE_DIRECTORIES)
|
|
+ get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm_optionparser INTERFACE_INCLUDE_DIRECTORIES)
|
|
+ if(MSVC)
|
|
+ set(VTKm_DEFINITIONS /bigobj)
|
|
+ endif()
|
|
+ else()
|
|
+ message(FATAL_ERROR "VTKM target missing")
|
|
+ endif()
|
|
+ if(VTKM_FOUND)
|
|
+ message(STATUS "Found VTKm")
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
+vtk_module_third_party(
|
|
+ INTERNAL
|
|
+ HEADER_ONLY
|
|
+ LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt"
|
|
+ VERSION "master"
|
|
+ SUBDIRECTORY vtkvtkm
|
|
+ STANDARD_INCLUDE_DIRS
|
|
+ INTERFACE
|
|
+ EXTERNAL
|
|
+ PACKAGE VTKm
|
|
+ TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
|
|
+ #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
|
|
+ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS
|
|
+)
|
|
diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module
|
|
index a8e4dad0f..c7bbbf0e8 100644
|
|
--- a/ThirdParty/vtkm/vtk.module
|
|
+++ b/ThirdParty/vtkm/vtk.module
|
|
@@ -3,5 +3,7 @@ NAME
|
|
PRIVATE_DEPENDS
|
|
# While not needed to satisfy symbols, this is necessary to guarantee that
|
|
# VTK_SMP_IMPLEMENTATION_TYPE is available when configuring vtk-m.
|
|
- VTK::CommonCore
|
|
+ # VTK::CommonCore
|
|
+LIBRARY_NAME
|
|
+ VTKm
|
|
THIRD_PARTY
|