mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 01:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vtkm|vtk|paraview] update ports (#37119)

Browse Source 
closes #36801
closes #36253
closes #36044

~~includes #24327 to fix dlib linkage in the osx pipelines.~~ 

Need to look at 
~~#36044~~
~~#36345~~

merge after 
- [x] #37561

---------

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Alexander Neumann 2024-04-29 15:01:01 +02:00 committed by GitHub
parent 943c5ef1c8
commit 3efae11c36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
40 changed files with 893 additions and 3592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in
View File

@ -22,10 +22,10 @@ unset(BLA_STATIC)
if(@CBLAS@)
include(SelectLibraryConfigurations)
find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
select_library_configurations(CBLAS)
set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES})
set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES})
endif()
set(CMAKE_MODULE_PATH "${LAPACK_PREV_MODULE_PATH}")

2
ports/lapack-reference/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "lapack-reference",
"version": "3.11.0",
"port-version": 5,
"port-version": 6,
"description": "LAPACK - Linear Algebra PACKage",
"homepage": "https://netlib.org/lapack/",
"license": "BSD-3-Clause-Open-MPI",

19
ports/openmvs/fix-static-build.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39ec359ac3..03225b8940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,10 +177,10 @@ if(Boost_FOUND)
LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST)
ADD_DEFINITIONS(${Boost_DEFINITIONS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
- if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE)
- # work around this missing library link in vcpkg
- LIST(APPEND Boost_LIBRARIES zstd)
- endif()
+ LINK_LIBRARIES(${Boost_LIBRARIES})
+ find_package(zstd CONFIG REQUIRED)
+ LINK_LIBRARIES($<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+
SET(_USE_BOOST TRUE)
endif()

2
ports/openmvs/portfile.cmake
View File

@ -9,7 +9,7 @@ vcpkg_from_github(
PATCHES
fix-build.patch
no-absolute-paths.patch
fix_no_zstd.patch
fix-static-build.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

2
ports/openmvs/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "openmvs",
"version": "2.1.0",
"port-version": 3,
"port-version": 4,
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
"homepage": "https://cdcseacave.github.io/openMVS",
"license": "AGPL-3.0-only",

506
ports/paraview/53.diff
View File

@ -1,506 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3c91500041421328fde0821ef6876c78eef55d6..b4157a3d53407b536b3694b12faa3ed7794fb4c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,27 +1,20 @@
-if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
-endif ()
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
PROJECT(QtTesting)
IF(NOT DEFINED QtTesting_QT_VERSION)
- SET(QtTesting_QT_VERSION "4" CACHE STRING "Expected Qt version")
+ SET(QtTesting_QT_VERSION "5" CACHE STRING "Expected Qt version")
MARK_AS_ADVANCED(QtTesting_QT_VERSION)
- SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 4 5)
+ SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 5 6)
ENDIF()
-IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "4" OR
- QtTesting_QT_VERSION VERSION_EQUAL "5"))
- message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '4' or '5'")
+IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "5" OR
+ QtTesting_QT_VERSION VERSION_EQUAL "6"))
+ message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '5' or '6'")
ENDIF()
set(qt_imported_targets)
-IF(QtTesting_QT_VERSION VERSION_GREATER "4")
- FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets)
- SET(qt_imported_targets Qt5::Core Qt5::Widgets)
-ELSE()
- FIND_PACKAGE(Qt4 REQUIRED COMPONENTS QtGui)
- SET(qt_imported_targets Qt4::QtCore Qt4::QtGui)
-ENDIF()
+FIND_PACKAGE(Qt${QtTesting_QT_VERSION} REQUIRED COMPONENTS Core Widgets)
+SET(qt_imported_targets Qt${QtTesting_QT_VERSION}::Core Qt${QtTesting_QT_VERSION}::Widgets)
IF(NOT DEFINED QT_TESTING_WITH_PYTHON)
OPTION(QT_TESTING_WITH_PYTHON "Enable Qt Testing with Python" OFF)
diff --git a/Testing/CMake/qtTestingMacroGenerateMocs.cmake b/Testing/CMake/qtTestingMacroGenerateMocs.cmake
index 4b1f34a4fa5d7e7effb63ae49518e75c47e2598c..953e7402bc269cf3af41914945b194348cfc428a 100644
--- a/Testing/CMake/qtTestingMacroGenerateMocs.cmake
+++ b/Testing/CMake/qtTestingMacroGenerateMocs.cmake
@@ -19,3 +19,13 @@ macro(QT5_GENERATE_MOCS)
OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file})
endforeach()
endmacro()
+
+
+macro(QT6_GENERATE_MOCS)
+ foreach(file ${ARGN})
+ set(moc_file moc_${file})
+ QT_GENERATE_MOC(${file} ${moc_file})
+ set_property(SOURCE ${file} APPEND PROPERTY
+ OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file})
+ endforeach()
+endmacro()
diff --git a/Testing/Cpp/CMakeLists.txt b/Testing/Cpp/CMakeLists.txt
index fed244434f888af3ba2f4b50609f94d08eebd47b..31e629c990290bb5d4fce52005c1781aebdf3b5a 100644
--- a/Testing/Cpp/CMakeLists.txt
+++ b/Testing/Cpp/CMakeLists.txt
@@ -1,6 +1,9 @@
include(../CMake/qtTestingMacroGenerateMocs.cmake)
-IF(QtTesting_QT_VERSION VERSION_GREATER "4")
+IF(QtTesting_QT_VERSION VERSION_GREATER "5")
+ FIND_PACKAGE(Qt6 REQUIRED QUIET COMPONENTS Test)
+ SET(TEST_LIBRARIES Qt6::Test)
+ELSEIF(QtTesting_QT_VERSION VERSION_GREATER "4")
FIND_PACKAGE(Qt5 REQUIRED QUIET COMPONENTS Test)
SET(TEST_LIBRARIES Qt5::Test)
ELSE()
@@ -38,7 +41,10 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)
-if(QtTesting_QT_VERSION VERSION_GREATER "4")
+if(QtTesting_QT_VERSION VERSION_GREATER "5")
+ QT6_GENERATE_MOCS(${TEST_SOURCES})
+ QT6_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} )
+elseif(QtTesting_QT_VERSION VERSION_GREATER "4")
QT5_GENERATE_MOCS(${TEST_SOURCES})
QT5_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} )
else()
diff --git a/pq3DViewEventPlayer.cxx b/pq3DViewEventPlayer.cxx
index 5be26b88d394ee82543b039e2173f7624e960808..3ec526a9033328cc924f02dd4c0ba21f30b9a7de 100644
--- a/pq3DViewEventPlayer.cxx
+++ b/pq3DViewEventPlayer.cxx
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QApplication>
#include <QKeyEvent>
#include <QMouseEvent>
-#include <QRegExp>
+#include <QRegularExpression>
#include <QWidget>
#include <QtDebug>
@@ -53,18 +53,19 @@ bool pq3DViewEventPlayer::playEvent(
{
if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove")
{
- QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)");
- if (mouseRegExp.indexIn(Arguments) != -1)
+ QRegularExpression mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)");
+ QRegularExpressionMatch match = mouseRegExp.match(Arguments);
+ if (match.hasMatch())
{
- QVariant v = mouseRegExp.cap(1);
+ QVariant v = match.captured(1);
int x = static_cast<int>(v.toDouble() * widget->size().width());
- v = mouseRegExp.cap(2);
+ v = match.captured(2);
int y = static_cast<int>(v.toDouble() * widget->size().height());
- v = mouseRegExp.cap(3);
+ v = match.captured(3);
Qt::MouseButton button = static_cast<Qt::MouseButton>(v.toInt());
- v = mouseRegExp.cap(4);
+ v = match.captured(4);
Qt::MouseButtons buttons = static_cast<Qt::MouseButton>(v.toInt());
- v = mouseRegExp.cap(5);
+ v = match.captured(5);
Qt::KeyboardModifiers keym = static_cast<Qt::KeyboardModifier>(v.toInt());
QEvent::Type type = (Command == "mousePress")
? QEvent::MouseButtonPress
diff --git a/pq3DViewEventTranslator.cxx b/pq3DViewEventTranslator.cxx
index e42b28ec22ef24f07b5adffb1fb7740df320adf5..17f7b2d9e17a36b926c585f85ce37c1ee21b6eff 100644
--- a/pq3DViewEventTranslator.cxx
+++ b/pq3DViewEventTranslator.cxx
@@ -71,8 +71,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo
if (mouseEvent)
{
QSize size = widget->size();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ double normalized_x = mouseEvent->position().x() / static_cast<double>(size.width());
+ double normalized_y = mouseEvent->position().y() / static_cast<double>(size.height());
+#else
double normalized_x = mouseEvent->x() / static_cast<double>(size.width());
double normalized_y = mouseEvent->y() / static_cast<double>(size.height());
+#endif
int button = mouseEvent->button();
int buttons = mouseEvent->buttons();
int modifiers = mouseEvent->modifiers();
@@ -88,7 +93,10 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo
QMouseEvent e(QEvent::MouseButtonPress, QPoint(), Qt::MouseButton(), Qt::MouseButtons(),
Qt::KeyboardModifiers());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ // FIXME: QMouseEvent copy ctor is private in Qt6
lastMoveEvent = e;
+#endif
return true;
break;
}
@@ -98,10 +106,18 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo
QMouseEvent* mouseEvent = dynamic_cast<QMouseEvent*>(Event);
if (mouseEvent)
{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ QMouseEvent e(QEvent::MouseMove,
+ QPoint(mouseEvent->position().x(), mouseEvent->position().y()),
+#else
QMouseEvent e(QEvent::MouseMove, QPoint(mouseEvent->x(), mouseEvent->y()),
+#endif
mouseEvent->button(), mouseEvent->buttons(), mouseEvent->modifiers());
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ // FIXME: QMouseEvent copy ctor is private in Qt6
lastMoveEvent = e;
+#endif
}
return true;
break;
@@ -117,8 +133,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo
// record last move event if it is valid
if (lastMoveEvent.type() == QEvent::MouseMove)
{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ double normalized_x = lastMoveEvent.position().x() / static_cast<double>(size.width());
+ double normalized_y = lastMoveEvent.position().y() / static_cast<double>(size.height());
+#else
double normalized_x = lastMoveEvent.x() / static_cast<double>(size.width());
double normalized_y = lastMoveEvent.y() / static_cast<double>(size.height());
+#endif
int button = lastMoveEvent.button();
int buttons = lastMoveEvent.buttons();
int modifiers = lastMoveEvent.modifiers();
@@ -131,8 +152,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo
.arg(modifiers));
}
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ double normalized_x = mouseEvent->position().x() / static_cast<double>(size.width());
+ double normalized_y = mouseEvent->position().y() / static_cast<double>(size.height());
+#else
double normalized_x = mouseEvent->x() / static_cast<double>(size.width());
double normalized_y = mouseEvent->y() / static_cast<double>(size.height());
+#endif
int button = mouseEvent->button();
int buttons = mouseEvent->buttons();
int modifiers = mouseEvent->modifiers();
diff --git a/pqAbstractButtonEventTranslator.cxx b/pqAbstractButtonEventTranslator.cxx
index ad785ec90b564cde7fc5146e8060da8daf0cb459..bdcdced3de5248324b1bcca791026202878000b9 100644
--- a/pqAbstractButtonEventTranslator.cxx
+++ b/pqAbstractButtonEventTranslator.cxx
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QAction>
#include <QDebug>
#include <QKeyEvent>
+#include <QMenu>
#include <QMouseEvent>
#include <QPushButton>
#include <QToolButton>
diff --git a/pqAbstractItemViewEventPlayer.cxx b/pqAbstractItemViewEventPlayer.cxx
index 95860b099bae0c71b0b37aab980d06eb5d1caf1e..9ab04ae0e954a295b12b910e7e050bafd24555b2 100644
--- a/pqAbstractItemViewEventPlayer.cxx
+++ b/pqAbstractItemViewEventPlayer.cxx
@@ -48,7 +48,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/// Converts a string representation of a model index into the real thing
static QModelIndex OldGetIndex(QAbstractItemView& View, const QString& Name)
{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QStringList rows = Name.split('/', Qt::SkipEmptyParts);
+#else
QStringList rows = Name.split('/', QString::SkipEmptyParts);
+#endif
QString column;
if (rows.size())
@@ -88,7 +92,11 @@ static QModelIndex GetIndexByItemName(QAbstractItemView& View, const QString& Na
static QModelIndex GetIndex(QAbstractItemView* View, const QString& Name)
{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QStringList idxs = Name.split('/', Qt::SkipEmptyParts);
+#else
QStringList idxs = Name.split('/', QString::SkipEmptyParts);
+#endif
QModelIndex index;
for (int i = 0; i != idxs.size(); ++i)
@@ -200,7 +208,8 @@ bool pqAbstractItemViewEventPlayer::playEvent(
if (Command == "mouseWheel")
{
int delta = args[0].toInt();
- QWheelEvent we(QPoint(x, y), delta, buttons, keym);
+ QWheelEvent we(QPointF(x, y), QPointF(x, y), QPoint(0, 0), QPoint(0, delta), buttons, keym,
+ Qt::NoScrollPhase, false);
QCoreApplication::sendEvent(Object, &we);
return true;
}
diff --git a/pqAbstractItemViewEventPlayerBase.cxx b/pqAbstractItemViewEventPlayerBase.cxx
index 8a523e668e4f8d37caae67787ab15cdd3ef7f9ff..fc52293a226a663f87e59246a60f94815e536900 100644
--- a/pqAbstractItemViewEventPlayerBase.cxx
+++ b/pqAbstractItemViewEventPlayerBase.cxx
@@ -163,11 +163,12 @@ bool pqAbstractItemViewEventPlayerBase::playEvent(
return false;
}
- QRegExp regExp1("^([\\d\\.]+),(\\d+)$");
- if (command == "setCheckState" && regExp1.indexIn(arguments) != -1)
+ QRegularExpression regExp1("^([\\d\\.]+),(\\d+)$");
+ QRegularExpressionMatch match = regExp1.match(arguments);
+ if (command == "setCheckState" && match.hasMatch())
{
- QString strIndex = regExp1.cap(1);
- int check_state = regExp1.cap(2).toInt();
+ QString strIndex = match.captured(1);
+ int check_state = match.captured(2).toInt();
QModelIndex index =
pqAbstractItemViewEventPlayerBase::GetIndex(strIndex, abstractItemView, error);
diff --git a/pqAbstractItemViewEventTranslator.cxx b/pqAbstractItemViewEventTranslator.cxx
index b769cca66eab194773d5338171152715181efaa3..07f7b42071582906fcbdbbc149a69773c92b31e6 100644
--- a/pqAbstractItemViewEventTranslator.cxx
+++ b/pqAbstractItemViewEventTranslator.cxx
@@ -153,11 +153,19 @@ bool pqAbstractItemViewEventTranslator::translateEvent(QObject* Object, QEvent*
if (wheelEvent)
{
QString idxStr;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QModelIndex idx = object->indexAt(wheelEvent->position().toPoint());
+#else
QModelIndex idx = object->indexAt(wheelEvent->pos());
+#endif
idxStr = toIndexStr(idx);
QRect r = object->visualRect(idx);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ relPt = wheelEvent->position().toPoint() - r.topLeft();
+#else
relPt = wheelEvent->pos() - r.topLeft();
- int numStep = wheelEvent->delta() > 0 ? 120 : -120;
+#endif
+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120;
int buttons = wheelEvent->buttons();
int modifiers = wheelEvent->modifiers();
Q_EMIT recordEvent(Object, "mouseWheel", QString("%1,%2,%3,%4,%5")
diff --git a/pqBasicWidgetEventPlayer.cxx b/pqBasicWidgetEventPlayer.cxx
index 27663a340efb87b92fc4ce10ac393238e8925e95..11ac0d577d53b66e7f624354292a70fb26b553d3 100644
--- a/pqBasicWidgetEventPlayer.cxx
+++ b/pqBasicWidgetEventPlayer.cxx
@@ -83,7 +83,8 @@ bool pqBasicWidgetEventPlayer::playEvent(
if (command == "mouseWheel")
{
int delta = args[0].toInt();
- QWheelEvent we(QPoint(x, y), delta, buttons, keym);
+ QWheelEvent we(QPoint(x, y), QPoint(x, y), QPoint(0, 0), QPoint(0, delta), buttons,
+ keym, Qt::NoScrollPhase, false);
QCoreApplication::sendEvent(object, &we);
return true;
}
diff --git a/pqBasicWidgetEventTranslator.cxx b/pqBasicWidgetEventTranslator.cxx
index bdbc340cb9714aea681024d24055be113f6b1bd4..57026f6a65408252602765ad6de6771fef58afa8 100644
--- a/pqBasicWidgetEventTranslator.cxx
+++ b/pqBasicWidgetEventTranslator.cxx
@@ -80,8 +80,13 @@ bool pqBasicWidgetEventTranslator::translateEvent(
.arg(mouseEvent->button())
.arg(mouseEvent->buttons())
.arg(mouseEvent->modifiers())
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ .arg(mouseEvent->position().x())
+ .arg(mouseEvent->position().y());
+#else
.arg(mouseEvent->x())
.arg(mouseEvent->y());
+#endif
if (event->type() != QEvent::MouseButtonRelease)
{
@@ -116,13 +121,18 @@ bool pqBasicWidgetEventTranslator::translateEvent(
{
int buttons = wheelEvent->buttons();
int modifiers = wheelEvent->modifiers();
- int numStep = wheelEvent->delta();
+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120;
Q_EMIT recordEvent(object, "mouseWheel", QString("%1,%2,%3,%4,%5")
.arg(numStep)
.arg(buttons)
.arg(modifiers)
- .arg(wheelEvent->x())
- .arg(wheelEvent->y()));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ .arg(wheelEvent->position().x())
+ .arg(wheelEvent->position().y()));
+#else
+ .arg(wheelEvent->pos().x())
+ .arg(wheelEvent->pos().y()));
+#endif
}
}
return true;
diff --git a/pqEventRecorder.cxx b/pqEventRecorder.cxx
index e20b15ef096a68f5126e387dbfb551a8a5a01c31..8737dfa9fefdbcbe5e9df6dda1621f043e345b69 100644
--- a/pqEventRecorder.cxx
+++ b/pqEventRecorder.cxx
@@ -192,8 +192,10 @@ void pqEventRecorder::start()
// Set the device
this->Stream.setDevice(this->File);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// Set UTF8 Codec
this->Stream.setCodec("UTF-8");
+#endif
// Set the Stream to the Observer
this->ActiveObserver->setStream(&this->Stream);
diff --git a/pqEventTranslator.cxx b/pqEventTranslator.cxx
index beb7be450741abef46cee21f11f502ecf84f0552..9d9d691848847e47ad2596bea4134e1ccb14665d 100644
--- a/pqEventTranslator.cxx
+++ b/pqEventTranslator.cxx
@@ -103,7 +103,7 @@ struct pqEventTranslator::pqImplementation
/// Stores the working set of widget translators
QList<pqWidgetEventTranslator*> Translators;
/// Stores the set of objects that should be ignored when translating events
- QMap<QObject*, QRegExp> IgnoredObjects;
+ QMap<QObject*, QRegularExpression> IgnoredObjects;
// list of widgets for which mouse propagation will happen
// we'll only translate the first and ignore the rest
@@ -272,7 +272,7 @@ pqEventComment* pqEventTranslator::eventComment() const
}
// ----------------------------------------------------------------------------
-void pqEventTranslator::ignoreObject(QObject* object, QRegExp commandFilter)
+void pqEventTranslator::ignoreObject(QObject* object, QRegularExpression commandFilter)
{
this->Implementation->IgnoredObjects.insert(object, commandFilter);
}
@@ -353,11 +353,21 @@ bool pqEventTranslator::eventFilter(QObject* object, QEvent* event)
{
// Check it is not the overlay, and it contains the mouse cursor
if (topWidget != this->Implementation->CheckOverlay &&
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ topWidget->geometry().contains(
+ static_cast<QMouseEvent*>(event)->globalPosition().toPoint(), true))
+#else
topWidget->geometry().contains(static_cast<QMouseEvent*>(event)->globalPos(), true))
+#endif
{
// Recover the child widget onder the cursor, if any
QWidget* childWidget = topWidget->childAt(
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ topWidget->mapFromGlobal(
+ static_cast<QMouseEvent*>(event)->globalPosition().toPoint()));
+#else
topWidget->mapFromGlobal(static_cast<QMouseEvent*>(event)->globalPos()));
+#endif
// If child exist, check it is not the overlayed widget and indeed a new widget
if (childWidget == NULL ||
@@ -583,7 +593,7 @@ void pqEventTranslator::onRecordEvent(
{
if (this->Implementation->IgnoredObjects.contains(Object))
{
- QRegExp commandFilter = this->Implementation->IgnoredObjects.value(Object);
+ QRegularExpression commandFilter = this->Implementation->IgnoredObjects.value(Object);
if (Command.contains(commandFilter))
{
return;
diff --git a/pqEventTranslator.h b/pqEventTranslator.h
index d756bec96f42db4db8e28517a0d610cbef0e1ef4..4b0549f6d794cfeb43ecd6ea2644a5067e25c34d 100644
--- a/pqEventTranslator.h
+++ b/pqEventTranslator.h
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "QtTestingExport.h"
#include <QObject>
#include <QRect>
-#include <QRegExp>
+#include <QRegularExpression>
class pqEventComment;
class pqTestUtility;
@@ -92,8 +92,8 @@ public:
/// translating events which command is equivalent to the regexp
/// (useful to prevent recording UI events from being
/// captured as part of the recording)
- void ignoreObject(
- QObject* object, QRegExp commandFilter = QRegExp("*", Qt::CaseInsensitive, QRegExp::Wildcard));
+ void ignoreObject(QObject* object, QRegularExpression commandFilter = QRegularExpression(
+ "*", QRegularExpression::CaseInsensitiveOption));
/// start listening to the GUI and translating events
void start();
diff --git a/pqObjectNaming.h b/pqObjectNaming.h
index d31b28d4a4f8275232331af860699796c77c2114..5cef1618d431d26f38cf10d2649e2dc5202f737f 100644
--- a/pqObjectNaming.h
+++ b/pqObjectNaming.h
@@ -38,7 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "QtTestingExport.h"
class QObject;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
class QStringList;
+#endif
/// Provides functionality to ensuring that Qt objects can be uniquely identified for recording and
/// playback of regression tests
diff --git a/pqPlayBackEventsDialog.cxx b/pqPlayBackEventsDialog.cxx
index d8b3e9547d146fb68dd6c61942b825ae67cd67ec..ff0ebb926c3f49b29f1bce06fa36c4e65a889b0c 100644
--- a/pqPlayBackEventsDialog.cxx
+++ b/pqPlayBackEventsDialog.cxx
@@ -350,7 +350,9 @@ void pqPlayBackEventsDialog::onStarted(const QString& filename)
file.open(QIODevice::ReadOnly);
this->Implementation->Ui.logBrowser->append(QString("Start file : %1").arg(infoFile.fileName()));
QTextStream stream(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
stream.setCodec("UTF-8");
+#endif
this->Implementation->Ui.currentFileLabel->setText(infoFile.fileName());
while (!stream.atEnd())
{
diff --git a/pqTreeViewEventPlayer.cxx b/pqTreeViewEventPlayer.cxx
index 02199925d018adc0df3a85548a7813aee7f21c84..d541a9cc684be11b0d30f1fdf321d872e8f9a78b 100644
--- a/pqTreeViewEventPlayer.cxx
+++ b/pqTreeViewEventPlayer.cxx
@@ -63,8 +63,9 @@ bool pqTreeViewEventPlayer::playEvent(
return false;
}
- QRegExp regExp0("^([\\d\\.]+),(\\d+),(\\d+)$");
- if (command == "setTreeItemCheckState" && regExp0.indexIn(arguments) != -1)
+ QRegularExpression regExp0("^([\\d\\.]+),(\\d+),(\\d+)$");
+ QRegularExpressionMatch match = regExp0.match(arguments);
+ if (command == "setTreeItemCheckState" && match.hasMatch())
{
// legacy command recorded from tree widgets.
QTreeWidget* treeWidget = qobject_cast<QTreeWidget*>(object);
@@ -72,11 +73,14 @@ bool pqTreeViewEventPlayer::playEvent(
{
return false;
}
- QString str_index = regExp0.cap(1);
- int column = regExp0.cap(2).toInt();
- int check_state = regExp0.cap(3).toInt();
-
+ QString str_index = match.captured(1);
+ int column = match.captured(2).toInt();
+ int check_state = match.captured(3).toInt();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QStringList indices = str_index.split(".", Qt::SkipEmptyParts);
+#else
QStringList indices = str_index.split(".", QString::SkipEmptyParts);
+#endif
QTreeWidgetItem* cur_item = NULL;
Q_FOREACH (QString cur_index, indices)
{

148
ports/paraview/external_vtk.patch
View File

@ -1,148 +0,0 @@
diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
index 70c771151..14df81490 100644
--- a/CMake/ParaViewOptions.cmake
+++ b/CMake/ParaViewOptions.cmake
@@ -99,7 +99,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 6ee167322..628745584 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,13 @@ 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")
+if (PARAVIEW_USE_EXTERNAL_VTK)
+ find_package(VTK CONFIG REQUIRED)
+ get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY )
+else()
+ set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
+endif()
+
if (NOT IS_DIRECTORY "${vtk_cmake_dir}")
message(FATAL_ERROR
"Failed to find the VTK CMake directory. Did you forget to initialize the "
@@ -242,9 +246,7 @@ if (PARAVIEW_USE_FORTRAN)
enable_language(Fortran OPTIONAL)
endif ()
-if (PARAVIEW_USE_EXTERNAL_VTK)
- find_package(VTK REQUIRED)
-else ()
+if (NOT PARAVIEW_USE_EXTERNAL_VTK)
list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
include(vtkCMakeBackports)
@@ -423,9 +425,67 @@ 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}.")
+ foreach(mod ${paraview_required_modules})
+ if(NOT TARGET ${mod})
+ list(APPEND modules_notarget ${mod})
+ endif()
+ if(${mod} MATCHES "VTK::") # For better debugging
+ list(APPEND vtk_modules ${mod})
+ endif()
+ endforeach()
+ foreach(mod ${paraview_unrecognized_modules})
+ if(NOT TARGET ${mod})
+ list(FIND paraview_rejected_modules ${mod} _found_mod)
+ if(_found_mod GREATER_EQUAL 0)
+ 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()
+ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
+ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
+ 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})
+ 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)
@@ -508,7 +574,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
@@ -642,6 +708,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}
@@ -703,9 +772,11 @@ if (PARAVIEW_ENABLE_CATALYST)
endif ()
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")

45
ports/paraview/fix-build.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake
index cba0380cd9..9c8bbc5084 100644
--- a/CMake/vtkModuleWrapClientServer.cmake
+++ b/CMake/vtkModuleWrapClientServer.cmake
@@ -72,8 +72,8 @@ function (_vtk_module_wrap_client_server_sources module sources classes)
"guarantee intended behavior.")
endif ()
endif ()
- file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}")
- file(GENERATE OUTPUT "include_directories_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}")
+ file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}")
+ file(GENERATE OUTPUT "include_directories_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}")
file(GENERATE
OUTPUT "${_vtk_client_server_args_file}"
CONTENT "$<$<BOOL:${_vtk_client_server_genex_compile_definitions_all}>:\n-D\'$<JOIN:${_vtk_client_server_genex_compile_definitions_all},\'\n-D\'>\'>\n
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1be00fb71a..c47cf20d55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ if (PARAVIEW_USE_EXTERNAL_VTK)
"External VTK not found but ParaView requires VTK to function")
endif ()
if (NOT PARAVIEW_BUILD_SHARED_LIBS)
- message(FATAL_ERROR
+ message(WARNING
"Static build with external VTK does not currently work.")
endif()
get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY)
diff --git a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
index 06e517964b..fbf9f5c2df 100644
--- a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
+++ b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx
@@ -13,8 +13,9 @@ extern "C"
void vtkPVInitializePythonModules();
void VTKUTILITIESPYTHONINTERPRETERPATH_EXPORT vtkPVPythonInterpreterPath()
{
- std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules);
- vtkPythonInterpreter::SetUserPythonPath(
- libraryPath.c_str(), "paraview/__init__.py" /*landmark*/);
+ // Ignore this for now. Requires a slightly newer VTK version than PV 5.12 uses.
+ //std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules);
+ //vtkPythonInterpreter::SetUserPythonPath(
+ // libraryPath.c_str(), "paraview/__init__.py" /*landmark*/);
}
}

35
ports/paraview/fix-configure.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b9fd80..94ad133 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,7 +557,16 @@ if (PARAVIEW_USE_EXTERNAL_VTK)
endforeach()
endmacro()
search_dependent_targets(${vtk_modules})
- find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}")
+
+ if (PARAVIEW_USE_PYTHON)
+ get_target_property(vtk_python_modules VTK::vtkpythonmodules "INTERFACE_LINK_LIBRARIES")
+ list(TRANSFORM vtk_python_modules REPLACE "Python$" "" OUTPUT_VARIABLE vtk_modules_wrapped)
+ list(TRANSFORM vtk_modules_wrapped REPLACE "^VTK::vtk" "" OUTPUT_VARIABLE vtk_components_wrapped)
+ list(APPEND vtk_components ${vtk_components_wrapped})
+ list(REMOVE_DUPLICATES vtk_components)
+ endif()
+
+ find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}")
if (PARAVIEW_USE_PYTHON)
find_package(Python3 3.3 QUIET REQUIRED COMPONENTS Interpreter)
set(PYTHON_VERSION_MAJOR "${Python3_VERSION_MAJOR}")
diff --git a/Qt/Python/vtk.module b/Qt/Python/vtk.module
index f82f076..86dbafd 100644
--- a/Qt/Python/vtk.module
+++ b/Qt/Python/vtk.module
@@ -12,7 +12,7 @@ GROUPS
PARAVIEW_CANONICAL
DEPENDS
ParaView::pqCore
- ParaView::PythonInitializer
+ #ParaView::PythonInitializer <- Creates a cycle
VTK::PythonInterpreter
VTK::WrappingPythonCore
TEST_LABELS

78
ports/paraview/portfile.cmake
View File

@ -1,4 +1,4 @@
set(VERSION_MAJOR_MINOR 5.11)
set(VERSION_MAJOR_MINOR 5.12)
set(plat_feat "")
if(VCPKG_TARGET_IS_LINUX)
@ -18,18 +18,46 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
${plat_feat}
)
vcpkg_download_distfile(
external_vtk_patch
URLS https://gitlab.kitware.com/paraview/paraview/-/merge_requests/6375.diff?full_index=1
FILENAME paraview_external_vtk_pr.diff
SHA512 c7760599239334817e9cad33ab7019c2dd0ce6740891e10ec15e1d63605ad73095fd7d48aed5ca8d002d25db356a7a5cf2a37188f0b43a7a9fa4c339e8f42adb
)
set(ext_vtk_patch_copy "${CURRENT_BUILDTREES_DIR}/paraview_external_vtk_pr.diff")
file(COPY "${external_vtk_patch}" DESTINATION "${CURRENT_BUILDTREES_DIR}" )
# Remove stuff which cannot be patched since it does not exist
vcpkg_replace_string("${ext_vtk_patch_copy}"
[[
diff --git a/.gitlab/ci/sccache.sh b/.gitlab/ci/sccache.sh
index f1897d6f719c3b61b6d4fa317966c007dab2fc23..e88d7c89198696832e5645bfb0e758fd5d92e6af 100755
--- a/.gitlab/ci/sccache.sh
+++ b/.gitlab/ci/sccache.sh
@@ -37,6 +37,6 @@ $shatool --check sccache.sha256sum
mv "$filename" sccache
chmod +x sccache
-mkdir shortcuts
+mkdir -p shortcuts
cp ./sccache shortcuts/gcc
cp ./sccache shortcuts/g++
]]
""
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Kitware/ParaView
REF 91aaf338c62f77fccd7d197dea05e7a68035ab25 # v5.11.0
SHA512 ddd72b127462a37dba220808925ab1991b3072ddd3f39ba7f26d260bd5abbaa6bd38a0c0181141f461df60dd718ec85df8c0faffff8e53a6cd1737b784565f4b
REF b701926ba2bd753eff36aec56e36ad4d5ac3168b # v5.12.0
SHA512 9fbebfa11b60c81deec0df7508a0433a1bced620367477e15314e232d50ba6a6196074d3d701434652cb9a2e0c946159f44e8e16682aa6326a89ebd6caa1f5d9
HEAD_REF master
PATCHES
external_vtk.patch
python_include.patch
python_wrapper.patch
${ext_vtk_patch_copy}
add-tools-option.patch
qt6-all.patch
fix-build.patch
fix-configure.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@ -44,8 +72,8 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH VISITIT_SOURCE_PATH
GITLAB_URL https://gitlab.kitware.com/
REPO paraview/visitbridge
REF df098f4148a96d62c388861c1d476039e02224ae
SHA512 002c2c934ef7e64c89b1567f406db1ebb90532817062e7016c248ba8ae85a88f1a35bc3963a9577ec08ba742a0e7fb91022c29aaaa0bddf0a1d585074341733e
REF 92ad478e3d6b18b111ef45ab76d6dad5d3530381
SHA512 c4893929b99419a365e90450f9c6d8a72f30f88aadbfe5c7d23ec4a46e9cf301e0b9c31cd602d1ab717ffb6744ae45abe41cb0e9c1f02b83e4468c702e8d023d
PATCHES
${VisItPatches}
)
@ -56,9 +84,8 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH QTTESTING_SOURCE_PATH
GITLAB_URL https://gitlab.kitware.com/
REPO paraview/qttesting
REF 08d96e9277bc4c26804fd77ce1b4fa5c791605ae # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6
SHA512 cb4acdfe1206bd8bae4f70185c8ca1ce555cf983a1d1e97293dac544ab13b039638bfe0d1e448f9589db92b6ed23b9b940157e72d9ec9e3994ea9858ab1722ec
PATCHES 53.diff
REF 9d4346485cfce79ad448f7e5656b2525b255b2ca # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6
SHA512 7561cd66e1a12053b7a81ab7a80ad2163922995317a503761521151668a905602fb1bb23c963e18d2739d17aa4187ccf1b4bd1010b0494aab6d4fc004e0e9760
)
vcpkg_from_gitlab(
@ -76,21 +103,32 @@ file(COPY "${ICET_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/IceT/vtk
if("python" IN_LIST FEATURES)
set(python_ver "")
if(NOT VCPKG_TARGET_IS_WINDOWS)
file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
file(GLOB _py3_include_path "${CURRENT_INSTALLED_DIR}/include/python3*")
string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path})
set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
set(python_ver "3.${PYTHON_VERSION_MINOR}")
endif()
list(APPEND ADDITIONAL_OPTIONS
-DPython3_FIND_REGISTRY=NEVER
"-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}"
"-DPython3_EXECUTABLE:PATH=${CURRENT_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}"
-DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=${PYTHON3_SITE}
-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst:STRING=YES
)
#VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PARAVIEW_BUILD_SHARED_LIBS)
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# Hitting pdb size limits when building debug paraview so increase it
string(APPEND VCPKG_LINKER_FLAGS_DEBUG " /PDBPAGESIZE:8192")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
OPTIONS
${FEATURE_OPTIONS}
-DPARAVIEW_USE_FORTRAN=OFF
-DPARAVIEW_BUILD_SHARED_LIBS=${PARAVIEW_BUILD_SHARED_LIBS}
-DPARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION:BOOL=ON
-DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON
-DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON
@ -107,7 +145,6 @@ vcpkg_cmake_configure(
${ADDITIONAL_OPTIONS}
#-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Graphviz=ON
)
if(CMAKE_HOST_UNIX)
# ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files
@ -169,9 +206,8 @@ foreach(tool ${TOOLS})
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)
# Handle copyright
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
macro(move_bin_to_lib name)
@ -200,7 +236,7 @@ endif()
file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake")
foreach(file IN LISTS cmake_files)
vcpkg_replace_string("${file}" "pv5.11d.exe" "pv5.11.exe")
vcpkg_replace_string("${file}" "pv${VERSION_MAJOR_MINOR}d.exe" "pv${VERSION_MAJOR_MINOR}.exe")
endforeach()
# The plugins also work without these files

13
ports/paraview/python_include.patch
View File

@ -1,13 +0,0 @@
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
ports/paraview/python_wrapper.patch
View File

@ -1,19 +0,0 @@
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"

2585
ports/paraview/qt6-all.patch
View File

File diff suppressed because it is too large Load Diff

3
ports/paraview/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "paraview",
"version": "5.11.0",
"port-version": 5,
"version": "5.12.0",
"description": "VTK-based Data Analysis and Visualization Application",
"homepage": "https://www.paraview.org/",
"license": "BSD-3-Clause",

38
ports/vtk-m/fix-build.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/vtkm/filter/flow/internal/Messenger.cxx b/vtkm/filter/flow/internal/Messenger.cxx
index 52c582f201..dff804cc8a 100644
--- a/vtkm/filter/flow/internal/Messenger.cxx
+++ b/vtkm/filter/flow/internal/Messenger.cxx
@@ -277,7 +277,7 @@ void Messenger::SendDataSync(int dst, int tag, vtkmdiy::MemoryBuffer& buff)
if (it == this->SyncSendBuffers.end())
{
std::vector<std::pair<int, vtkmdiy::MemoryBuffer>> vec;
- vec.push_back(std::move(entry));
+ vec.emplace_back(std::move(entry));
this->SyncSendBuffers.insert(std::make_pair(tag, std::move(vec)));
}
else
diff --git a/vtkm/filter/flow/internal/Messenger.h b/vtkm/filter/flow/internal/Messenger.h
index 42d554ae51..b6a0acb40b 100644
--- a/vtkm/filter/flow/internal/Messenger.h
+++ b/vtkm/filter/flow/internal/Messenger.h
@@ -44,6 +44,11 @@ public:
#endif
}
+ Messenger(const Messenger&) =delete;
+ Messenger(Messenger&&) =default;
+ Messenger& operator=(Messenger&&) =default;
+ Messenger& operator=(const Messenger&) =delete;
+
int GetRank() const { return this->Rank; }
int GetNumRanks() const { return this->NumRanks; }
@@ -108,7 +113,7 @@ private:
//Member data
// <tag, {dst, buffer}>
- std::map<int, std::vector<std::pair<int, vtkmdiy::MemoryBuffer>>> SyncSendBuffers;
+ std::map<int, std::vector<std::pair<int, vtkmdiy::MemoryBuffer>>> SyncSendBuffers = {};
std::map<int, std::pair<std::size_t, std::size_t>> MessageTagInfo;
MPI_Comm MPIComm;
std::size_t MsgID;

14
ports/vtk-m/omp.patch
View File

@ -5,22 +5,22 @@ index e9ac039..c745604 100644
@@ -59,20 +59,14 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp)
find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET)
add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL)
+ target_link_libraries(vtkm::openmp INTERFACE OpenMP::OpenMP_CXX)
add_library(vtkm_openmp INTERFACE)
set_target_properties(vtkm_openmp PROPERTIES EXPORT_NAME openmp)
+ target_link_libraries(vtkm_openmp INTERFACE OpenMP::OpenMP_CXX)
if(OpenMP_CXX_FLAGS)
- set_property(TARGET vtkm::openmp
- set_property(TARGET vtkm_openmp
- APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:${OpenMP_CXX_FLAGS}>)
-
if(VTKm_ENABLE_CUDA)
string(REPLACE ";" "," openmp_cuda_flags "-Xcompiler=${OpenMP_CXX_FLAGS}")
set_property(TARGET vtkm::openmp
set_property(TARGET vtkm_openmp
APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CUDA>:${openmp_cuda_flags}>)
endif()
endif()
- if(OpenMP_CXX_LIBRARIES)
- set_target_properties(vtkm::openmp PROPERTIES
- set_target_properties(vtkm_openmp PROPERTIES
- INTERFACE_LINK_LIBRARIES "${OpenMP_CXX_LIBRARIES}")
- endif()
install(TARGETS vtkm_openmp EXPORT ${VTKm_EXPORT_NAME})
endif()
if(VTKm_ENABLE_CUDA)

36
ports/vtk-m/portfile.cmake
View File

@ -16,6 +16,7 @@ vcpkg_check_features (OUT_FEATURE_OPTIONS OPTIONS
tbb VTKm_ENABLE_TBB
mpi VTKm_ENABLE_MPI
double VTKm_USE_DOUBLE_PRECISION
kokkos VTKm_ENABLE_KOKKOS # No port yet
)
if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX})
@ -26,10 +27,22 @@ if("cuda" IN_LIST FEATURES AND NOT ENV{CUDACXX})
set(VCPKG_LIBRARY_LINKAGE "static") # CUDA forces static build.
endif()
list(APPEND OPTIONS -DVTKm_ENABLE_RENDERING=ON)
list(APPEND OPTIONS -DVTKm_ENABLE_DEVELOPER_FLAGS=OFF)
list(APPEND OPTIONS -DVTKm_ENABLE_CPACK=OFF)
list(APPEND OPTIONS -DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON)
list(APPEND OPTIONS
-DVTKm_ENABLE_RENDERING=ON
-DVTKm_ENABLE_DEVELOPER_FLAGS=OFF
-DVTKm_ENABLE_CPACK=OFF
-DVTKm_ENABLE_EXAMPLES=OFF
-DVTKm_ENABLE_TUTORIALS=OFF
-DVTKm_ENABLE_DOCUMENTATION=OFF
-DVTKm_ENABLE_BENCHMARKS=OFF
-DVTKm_USE_DEFAULT_TYPES_FOR_VTK=ON
-DBUILD_TESTING=OFF
-DVTKm_ENABLE_TESTING=OFF
-DVTKm_USE_64BIT_IDS=ON
-DVTKm_ENABLE_HDF5_IO=OFF
-DVTKm_NO_INSTALL_README_LICENSE=ON
-DVTKm_ENABLE_GPU_MPI=OFF
)
# For port customizations on unix systems.
# Please feel free to make these port features if it makes any sense
#list(APPEND OPTIONS -DVTKm_ENABLE_GL_CONTEXT=ON) # or
@ -40,29 +53,30 @@ list(APPEND OPTIONS -DBUILD_TESTING=OFF)
vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com"
OUT_SOURCE_PATH SOURCE_PATH
REPO vtk/vtk-m
REF 902fdac6fafb6358ce88f8747d55e2c0715241f1 # v1.9.0 Upgrading will most likly brake the VTK build
SHA512 f83872495ed3dbcea372776c4439a7d224568d144ff602c188fae120026778b1bee681c9e9535cc693e870cbc08ca9896af2bc954935c289f6b9a24f2471a50b
FILE_DISAMBIGUATOR 1
REF a057f62e756efc43095e72c5813aaaf2dea36ebb # v2.1.0 Upgrading will most likely break the VTK build
SHA512 fa08bd597e1918d10e7fed9f6b9667fd53f4a14589580e68691aad3cfb240f7de80fa0c5001712f100911c2262b5af3105b8f21da21b945a88e1204ea82b92a6
PATCHES
omp.patch
fix-build.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vtkm-1.9" PACKAGE_NAME vtkm)
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vtkm-2.1" PACKAGE_NAME vtkm)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake"
[[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.9")]]
[[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-2.1")]]
[[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]])
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "not/existing/buildtree")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/vtkm-1.9/vtkm.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vtkm.pc")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/vtkm-2.1/vtkm.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vtkm.pc")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/vtkm-1.9/vtkm.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vtkm.pc")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/vtkm-2.1/vtkm.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vtkm.pc")
endif()
vcpkg_fixup_pkgconfig()

3
ports/vtk-m/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "vtk-m",
"version": "1.9.0",
"port-version": 2,
"version": "2.1.0",
"description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.",
"homepage": "https://gitlab.kitware.com/vtk/vtk-m/",
"license": null,

195
ports/vtk/10945.diff Normal file
View File

@ -0,0 +1,195 @@
diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake
index d8282ff98f79548e66a1794c7daf9cd253f0a9e5..7163c690b069c3176a9c921d7799b105bb4b1825 100644
--- a/CMake/vtkModule.cmake
+++ b/CMake/vtkModule.cmake
@@ -129,6 +129,73 @@ function (_vtk_module_split_module_name name prefix)
PARENT_SCOPE)
endfunction ()
+#[==[.rst:
+.. cmake:command:: _vtk_module_optional_dependency_exists
+
+ Detect whether an optional dependency exists or not.
+ |module-internal|
+
+ Optional dependencies need to be detected
+ namespace and target name part.
+
+ .. code-block:: cmake
+
+ _vtk_module_split_module_name(<dependency>
+ SATISFIED_VAR <var>
+ [PACKAGE <package>])
+
+ The result will be returned in the variable specified by ``SATISFIED_VAR``. If
+ ``PACKAGE`` is not given, ``_vtk_build_PACKAGE`` will be used if defined,
+ otherwise an error will be raised.
+#]==]
+function (_vtk_module_optional_dependency_exists dependency)
+ cmake_parse_arguments(_vtk_optional_dep
+ ""
+ "SATISFIED_VAR;PACKAGE"
+ ""
+ ${ARGN})
+
+ if (_vtk_optional_dep_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR
+ "Unparsed arguments for `_vtk_module_optional_dependency_exists`: "
+ "${_vtk_optional_dep_UNPARSED_ARGUMENTS}")
+ endif ()
+
+ if (NOT _vtk_optional_dep_PACKAGE)
+ if (NOT DEFINED _vtk_build_PACKAGE)
+ message(FATAL_ERROR
+ "The `PACKAGE` argument is required outside of `vtk_module_build` "
+ "usage.")
+ endif ()
+ set(_vtk_optional_dep_PACKAGE
+ "${_vtk_build_PACKAGE}")
+ endif ()
+
+ if (NOT _vtk_optional_dep_SATISFIED_VAR)
+ message(FATAL_ERROR
+ "The `SATISFIED_VAR` argument is required.")
+ endif ()
+
+ set(_vtk_optional_dep_satisfied 0)
+ if (TARGET "${dependency}")
+ _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse)
+ if (_vtk_optional_dep_PACKAGE STREQUAL _vtk_optional_dep_parse_NAMESPACE)
+ set(_vtk_optional_dep_satisfied 1)
+ else ()
+ set(_vtk_optional_dep_found_var
+ "${_vtk_optional_dep_parse_NAMESPACE}_${_vtk_optional_dep_parse_TARGET_NAME}_FOUND")
+ if (DEFINED "${_vtk_optional_dep_found_var}" AND
+ ${_vtk_optional_dep_found_var})
+ set(_vtk_optional_dep_satisfied 1)
+ endif ()
+ endif ()
+ endif ()
+
+ set("${_vtk_optional_dep_SATISFIED_VAR}"
+ "${_vtk_optional_dep_satisfied}"
+ PARENT_SCOPE)
+endfunction ()
+
#[==[.rst:
.. _module-parse-module:
@@ -2827,8 +2894,12 @@ function (vtk_module_build)
get_property(_vtk_build_kit_module_optional_depends GLOBAL
PROPERTY "_vtk_module_${_vtk_build_kit_module}_optional_depends")
foreach (_vtk_build_kit_module_private_depend IN LISTS _vtk_build_kit_module_private_depends _vtk_build_kit_module_optional_depends)
- if (NOT TARGET "${_vtk_build_kit_module_private_depend}")
- continue ()
+ if (_vtk_build_kit_module_private_depend IN_LIST _vtk_build_kit_module_optional_depends)
+ _vtk_module_optional_dependency_exists("${_vtk_build_kit_module_private_depend}"
+ SATISFIED_VAR _vtk_build_kit_module_has_optional_dep)
+ if (NOT _vtk_build_kit_module_has_optional_dep)
+ continue ()
+ endif ()
endif ()
# But we don't need to link to modules that are part of the kit we are
@@ -4124,7 +4195,9 @@ function (vtk_module_add_module name)
get_property(_vtk_add_module_optional_depends GLOBAL
PROPERTY "_vtk_module_${_vtk_build_module}_optional_depends")
foreach (_vtk_add_module_optional_depend IN LISTS _vtk_add_module_optional_depends)
- if (TARGET "${_vtk_add_module_optional_depend}")
+ _vtk_module_optional_dependency_exists("${_vtk_add_module_optional_depend}"
+ SATISFIED_VAR _vtk_add_module_optional_depend_exists)
+ if (_vtk_add_module_optional_depend_exists)
set(_vtk_add_module_optional_depend_link "${_vtk_add_module_optional_depend}")
if (_vtk_add_module_build_with_kit)
get_property(_vtk_add_module_optional_depend_kit GLOBAL
@@ -4149,7 +4222,7 @@ function (vtk_module_add_module name)
string(REPLACE "::" "_" _vtk_add_module_optional_depend_safe "${_vtk_add_module_optional_depend}")
target_compile_definitions("${_vtk_add_module_real_target}"
PRIVATE
- "VTK_MODULE_ENABLE_${_vtk_add_module_optional_depend_safe}=$<TARGET_EXISTS:${_vtk_add_module_optional_depend}>")
+ "VTK_MODULE_ENABLE_${_vtk_add_module_optional_depend_safe}=$<BOOL:${_vtk_add_module_optional_depend_exists}>")
endforeach ()
if (_vtk_add_module_private_depends_forward_link)
@@ -4801,10 +4874,12 @@ function (vtk_module_add_executable name)
get_property(_vtk_add_executable_optional_depends GLOBAL
PROPERTY "_vtk_module_${_vtk_build_module}_optional_depends")
foreach (_vtk_add_executable_optional_depend IN LISTS _vtk_add_executable_optional_depends)
+ _vtk_module_optional_dependency_exists("${_vtk_add_executable_optional_depend}"
+ SATISFIED_VAR _vtk_add_executable_optional_depend_exists)
string(REPLACE "::" "_" _vtk_add_executable_optional_depend_safe "${_vtk_add_executable_optional_depend}")
target_compile_definitions("${_vtk_add_executable_target_name}"
PRIVATE
- "VTK_MODULE_ENABLE_${_vtk_add_executable_optional_depend_safe}=$<TARGET_EXISTS:{_vtk_add_executable_optional_depend}>")
+ "VTK_MODULE_ENABLE_${_vtk_add_executable_optional_depend_safe}=$<BOOL:{_vtk_add_executable_optional_depend_exists}>")
endforeach ()
if (_vtk_module_warnings)
@@ -5135,6 +5210,12 @@ while (_vtk_module_find_package_components_to_check)
list(APPEND _vtk_module_find_package_components_checked
\"\${_vtk_module_component}\")
+ # Any 'components' with `::` are not from our package and must have been
+ # provided/satisfied elsewhere.
+ if (_vtk_module_find_package_components MATCHES \"::\")
+ continue ()
+ endif ()
+
list(APPEND _vtk_module_find_package_components
\"\${_vtk_module_component}\")
if (\${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED_\${_vtk_module_component})
diff --git a/CMake/vtkModuleTesting.cmake b/CMake/vtkModuleTesting.cmake
index 4d91c569e63e1d7c7747fa25da30903645cb9b84..55ebd2651e9c329b05d8b12a9cfad6ea87e74b26 100644
--- a/CMake/vtkModuleTesting.cmake
+++ b/CMake/vtkModuleTesting.cmake
@@ -79,13 +79,15 @@ function (vtk_module_test_executable name)
PROPERTY "_vtk_module_${_vtk_build_test}_test_optional_depends")
set(optional_depends_flags)
foreach (test_optional_depend IN LISTS test_optional_depends)
- if (TARGET "${test_optional_depend}")
+ _vtk_module_optional_dependency_exists("${test_optional_depend}"
+ SATISFIED_VAR test_optional_depend_exists)
+ if (test_optional_depend_exists)
list(APPEND test_depends
"${test_optional_depend}")
endif ()
string(REPLACE "::" "_" safe_test_optional_depend "${test_optional_depend}")
list(APPEND optional_depends_flags
- "VTK_MODULE_ENABLE_${safe_test_optional_depend}=$<TARGET_EXISTS:${test_optional_depend}>")
+ "VTK_MODULE_ENABLE_${safe_test_optional_depend}=$<BOOL:${test_optional_depend_exists}>")
endforeach ()
if (_vtk_build_UTILITY_TARGET)
diff --git a/Documentation/release/dev/better-optional-deps-checks.md b/Documentation/release/dev/better-optional-deps-checks.md
new file mode 100644
index 0000000000000000000000000000000000000000..2ce1e98d95dc247a8912dc1b976f592548a83d49
--- /dev/null
+++ b/Documentation/release/dev/better-optional-deps-checks.md
@@ -0,0 +1,3 @@
+## better-optional-deps-checks
+
+Optional dependencies now have better logic for detecting the usability of external optional dependencies.
diff --git a/Testing/External/CMakeLists.txt b/Testing/External/CMakeLists.txt
index 8d2de9844d979c3298b8fe337f428dbe12b86191..510620f7616f9152f4dfb8f364579a1c3bf1bcdb 100644
--- a/Testing/External/CMakeLists.txt
+++ b/Testing/External/CMakeLists.txt
@@ -53,6 +53,7 @@ vtk_module_scan(
# Input information for test build files.
option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF)
+set(_vtk_build_PACKAGE "VTK")
set(_vtk_build_TEST_DATA_TARGET "VTKData")
set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing")
set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing")
diff --git a/Testing/ExternalWheel/CMakeLists.txt b/Testing/ExternalWheel/CMakeLists.txt
index 518380d5370a9b0b61e0d0f48ae751a81b595098..c9c984578b682f1a6a605b3546e826b63f9c88ea 100644
--- a/Testing/ExternalWheel/CMakeLists.txt
+++ b/Testing/ExternalWheel/CMakeLists.txt
@@ -82,6 +82,7 @@ endforeach ()
# Input information for test build files.
option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF)
+set(_vtk_build_PACKAGE "VTK")
set(_vtk_build_TEST_DATA_TARGET "VTKData")
set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing")
set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing")

151
ports/vtk/10972.diff Normal file
View File

@ -0,0 +1,151 @@
diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in
index 30479050f9d2e4d3123844debbb807df18905a45..48e0ee709f2dce6f23e2365fe65e5f4f4fa444f2 100644
--- a/CMake/vtk-config.cmake.in
+++ b/CMake/vtk-config.cmake.in
@@ -236,8 +236,18 @@ if (${CMAKE_FIND_PACKAGE_NAME}_WRAP_JAVA)
endif ()
endif ()
+set(_vtk_search_components
+ ${${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS})
+if (NOT _vtk_search_components)
+ set(_vtk_search_components
+ ${${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS})
+endif ()
+list(REMOVE_ITEM _vtk_search_components
+ # These components need to always be requested explicitly since they are
+ # not modules.
+ @_vtk_non_module_components@)
set(_vtk_components_to_check)
-foreach (_vtk_component IN LISTS "${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS")
+foreach (_vtk_component IN LISTS _vtk_search_components)
if (DEFINED "${CMAKE_FIND_PACKAGE_NAME}_${_vtk_component}_FOUND")
# It was already not-found (likely due to `find-package` failures).
elseif (TARGET "${CMAKE_FIND_PACKAGE_NAME}::${_vtk_component}")
@@ -250,6 +260,7 @@ foreach (_vtk_component IN LISTS "${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS")
endif ()
endforeach ()
unset(_vtk_component)
+unset(_vtk_search_components)
while (_vtk_components_to_check)
list(GET _vtk_components_to_check 0 _vtk_component)
diff --git a/CMake/vtkModule.cmake b/CMake/vtkModule.cmake
index 7163c690b069c3176a9c921d7799b105bb4b1825..ed7e398aa56cdaa079e688a8bfae96b9b97b6919 100644
--- a/CMake/vtkModule.cmake
+++ b/CMake/vtkModule.cmake
@@ -140,13 +140,10 @@ endfunction ()
.. code-block:: cmake
- _vtk_module_split_module_name(<dependency>
- SATISFIED_VAR <var>
- [PACKAGE <package>])
+ _vtk_module_optional_dependency_exists(<dependency>
+ SATISFIED_VAR <var>)
- The result will be returned in the variable specified by ``SATISFIED_VAR``. If
- ``PACKAGE`` is not given, ``_vtk_build_PACKAGE`` will be used if defined,
- otherwise an error will be raised.
+ The result will be returned in the variable specified by ``SATISFIED_VAR``.
#]==]
function (_vtk_module_optional_dependency_exists dependency)
cmake_parse_arguments(_vtk_optional_dep
@@ -161,16 +158,6 @@ function (_vtk_module_optional_dependency_exists dependency)
"${_vtk_optional_dep_UNPARSED_ARGUMENTS}")
endif ()
- if (NOT _vtk_optional_dep_PACKAGE)
- if (NOT DEFINED _vtk_build_PACKAGE)
- message(FATAL_ERROR
- "The `PACKAGE` argument is required outside of `vtk_module_build` "
- "usage.")
- endif ()
- set(_vtk_optional_dep_PACKAGE
- "${_vtk_build_PACKAGE}")
- endif ()
-
if (NOT _vtk_optional_dep_SATISFIED_VAR)
message(FATAL_ERROR
"The `SATISFIED_VAR` argument is required.")
@@ -178,16 +165,22 @@ function (_vtk_module_optional_dependency_exists dependency)
set(_vtk_optional_dep_satisfied 0)
if (TARGET "${dependency}")
- _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse)
- if (_vtk_optional_dep_PACKAGE STREQUAL _vtk_optional_dep_parse_NAMESPACE)
- set(_vtk_optional_dep_satisfied 1)
- else ()
+ # If the target is imported, we check its `_FOUND` variable. If it is not
+ # imported, we assume it is set up properly as a normal target (or an
+ # `ALIAS`).
+ get_property(_vtk_optional_dep_is_imported
+ TARGET "${dependency}"
+ PROPERTY IMPORTED)
+ if (_vtk_optional_dep_is_imported)
+ _vtk_module_split_module_name("${dependency}" _vtk_optional_dep_parse)
set(_vtk_optional_dep_found_var
"${_vtk_optional_dep_parse_NAMESPACE}_${_vtk_optional_dep_parse_TARGET_NAME}_FOUND")
if (DEFINED "${_vtk_optional_dep_found_var}" AND
${_vtk_optional_dep_found_var})
set(_vtk_optional_dep_satisfied 1)
endif ()
+ else ()
+ set(_vtk_optional_dep_satisfied 1)
endif ()
endif ()
diff --git a/Filters/Parallel/Testing/Python/CMakeLists.txt b/Filters/Parallel/Testing/Python/CMakeLists.txt
index a59308d5bda968bbc4864eaae45fa1cfb677e1a3..90db33b578d570d1d8a75ab0d82f29781250c4a8 100644
--- a/Filters/Parallel/Testing/Python/CMakeLists.txt
+++ b/Filters/Parallel/Testing/Python/CMakeLists.txt
@@ -8,9 +8,9 @@ vtk_add_test_python(TestIntegrateAttributes.py NO_OUTPUT NO_VALID NO_RT)
vtk_add_test_python(TestRemoveGhosts.py NO_DATA NO_OUTPUT NO_VALID NO_RT)
vtk_add_test_python(TestResamplingInterpolator.py)
-if(TARGET pvtkpython)
+if(TARGET VTK::pvtkpython)
add_test(NAME vtkFiltersParallelPython-testTransmit
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS}
- $<TARGET_FILE:pvtkpython> ${CMAKE_CURRENT_SOURCE_DIR}/testTransmit.py
+ $<TARGET_FILE:VTK::pvtkpython> ${CMAKE_CURRENT_SOURCE_DIR}/testTransmit.py
${VTK_MPI_POSTFLAGS})
endif()
diff --git a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt
index 87033ff51b7631ce556aeef42b94430d467a0549..9fa4fd126e753d025357a41c945f0a4fcbfe9ebc 100644
--- a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt
@@ -121,7 +121,7 @@ vtk_test_cxx_executable(vtkRenderingRayTracingCxxTests all_tests RENDERING_FACTO
# Do we have MPI and parallel support
-if (VTK_ENABLE_OSPRAY AND TARGET vtkRenderingParallel AND TARGET vtkParallelMPI)
+if (VTK_ENABLE_OSPRAY AND TARGET VTK::RenderingParallel AND TARGET VTK::ParallelMPI)
set(vtkRenderingRayTracingCxx-MPI_NUMPROCS 2)
vtk_add_test_mpi(vtkRenderingRayTracingCxx-MPI tests
TESTING_DATA
diff --git a/Testing/External/CMakeLists.txt b/Testing/External/CMakeLists.txt
index 510620f7616f9152f4dfb8f364579a1c3bf1bcdb..8d2de9844d979c3298b8fe337f428dbe12b86191 100644
--- a/Testing/External/CMakeLists.txt
+++ b/Testing/External/CMakeLists.txt
@@ -53,7 +53,6 @@ vtk_module_scan(
# Input information for test build files.
option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF)
-set(_vtk_build_PACKAGE "VTK")
set(_vtk_build_TEST_DATA_TARGET "VTKData")
set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing")
set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing")
diff --git a/Testing/ExternalWheel/CMakeLists.txt b/Testing/ExternalWheel/CMakeLists.txt
index c9c984578b682f1a6a605b3546e826b63f9c88ea..518380d5370a9b0b61e0d0f48ae751a81b595098 100644
--- a/Testing/ExternalWheel/CMakeLists.txt
+++ b/Testing/ExternalWheel/CMakeLists.txt
@@ -82,7 +82,6 @@ endforeach ()
# Input information for test build files.
option(VTK_USE_LARGE_DATA "Enable tests requiring \"large\" data" OFF)
-set(_vtk_build_PACKAGE "VTK")
set(_vtk_build_TEST_DATA_TARGET "VTKData")
set(_vtk_build_TEST_INPUT_DATA_DIRECTORY "${VTK_TOP_DIR}/Testing")
set(_vtk_build_TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing")

27
ports/vtk/9690.diff
View File

@ -1,27 +0,0 @@
diff --git a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
index 1a412b56d028ecc7015976cd6effe8b0bb59e6fe..8f5e6e4c077b52eb956bfe8aacf7d1647860d405 100644
--- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
+++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
@@ -156,6 +156,9 @@ static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, hadd
}
static const H5FD_class_t H5FD_dsm_g = {
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>13)||((H5_VERS_MINOR==13)&&(H5_VERS_RELEASE>=2))))
+ 0, /*version */
+#endif
#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=13))
H5_VFD_RESERVED + 0xd3f2, /*value */
#endif
@@ -190,6 +193,12 @@ static const H5FD_class_t H5FD_dsm_g = {
NULL, /*get_handle */
H5FD_dsm_read, /*read */
H5FD_dsm_write, /*write */
+#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>13)||((H5_VERS_MINOR==13)&&(H5_VERS_RELEASE>=2))))
+ NULL, /*read_vector */
+ NULL, /*write_vector */
+ NULL, /*read_selection */
+ NULL, /*write_selection */
+#endif
NULL, /*flush */
#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
NULL, /* truncate */

70
ports/vtk/devendor_exodusII.patch Normal file
View File

@ -0,0 +1,70 @@
diff --git a/ThirdParty/exodusII/CMakeLists.txt b/ThirdParty/exodusII/CMakeLists.txt
index 7a0cefb..3139114 100644
--- a/ThirdParty/exodusII/CMakeLists.txt
+++ b/ThirdParty/exodusII/CMakeLists.txt
@@ -1,20 +1,27 @@
-vtk_module_third_party_internal(
- LICENSE_FILES
- "vtkexodusII/COPYRIGHT"
- SPDX_LICENSE_IDENTIFIER
- "BSD-3-Clause"
- SPDX_COPYRIGHT_TEXT
- "Copyright (c) 2005-2017 National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
- SPDX_DOWNLOAD_LOCATION
- "git+https://gitlab.kitware.com/third-party/seacas.git@exodus/for/vtk-20220706-v2021-05-12#packages/seacas/libraries/exodus"
- VERSION
- "8.11f"
- STANDARD_INCLUDE_DIRS)
+vtk_module_third_party(
+ INTERNAL
+ LICENSE_FILES
+ "vtkexodusII/COPYRIGHT"
+ SPDX_LICENSE_IDENTIFIER
+ "BSD-3-Clause"
+ SPDX_COPYRIGHT_TEXT
+ "Copyright (c) 2005-2017 National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
+ SPDX_DOWNLOAD_LOCATION
+ "git+https://gitlab.kitware.com/third-party/seacas.git@exodus/for/vtk-20220706-v2021-05-12#packages/seacas/libraries/exodus"
+ VERSION
+ "8.11f"
+ STANDARD_INCLUDE_DIRS
+ EXTERNAL
+ PACKAGE SEACASExodus
+ CONFIG_MODE
+ TARGETS SEACASExodus::exodus
+ STANDARD_INCLUDE_DIRS
+)
-#configure_file(
-# "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h.in"
-# "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
vtk_module_install_headers(
-# FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
- FILES "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h")
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_exodusII.h")
+# FILES "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h")
diff --git a/ThirdParty/exodusII/vtk_exodusII.h.in b/ThirdParty/exodusII/vtk_exodusII.h.in
new file mode 100644
index 0000000..ac2ab78
--- /dev/null
+++ b/ThirdParty/exodusII/vtk_exodusII.h.in
@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+// SPDX-License-Identifier: BSD-3-Clause
+#ifndef vtk_exodusII_h
+#define vtk_exodusII_h
+
+/* Use the libproj library configured for VTK. */
+#cmakedefine01 VTK_MODULE_USE_EXTERNAL_vtkexodusII
+
+#if VTK_MODULE_USE_EXTERNAL_vtkexodusII
+# include <exodusII.h>
+#else
+# include <vtkexodusII/include/exodusII.h>
+#endif
+
+#endif

12
ports/vtk/fast-float.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/ThirdParty/fast_float/CMakeLists.txt b/ThirdParty/fast_float/CMakeLists.txt
index e6e63cbfe6..919b12a509 100644
--- a/ThirdParty/fast_float/CMakeLists.txt
+++ b/ThirdParty/fast_float/CMakeLists.txt
@@ -13,7 +13,6 @@ vtk_module_third_party(
STANDARD_INCLUDE_DIRS
HEADER_ONLY
EXTERNAL
- VERSION "3.9.0"
PACKAGE FastFloat
TARGETS FastFloat::fast_float
STANDARD_INCLUDE_DIRS

13
ports/vtk/fix-exprtk.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMake/FindExprTk.cmake b/CMake/FindExprTk.cmake
index 2886e7ed71..cb8a875725 100644
--- a/CMake/FindExprTk.cmake
+++ b/CMake/FindExprTk.cmake
@@ -24,7 +24,7 @@ if (ExprTk_INCLUDE_DIR)
set(ExprTk_VERSION)
foreach (_exprtk_version_line IN LISTS _exprtk_version_header)
if ("${ExprTk_VERSION}" STREQUAL "")
- string(REGEX MATCH "version = \"(2\.7[0-9.]+)\".*$" _exprtk_version_match "${_exprtk_version_line}")
+ string(REGEX MATCH [[version = "(2\.7[0-9.]+)".*$]] _exprtk_version_match "${_exprtk_version_line}")
set(ExprTk_VERSION "${CMAKE_MATCH_1}")
else ()
string(REGEX MATCH "\"([0-9.]+)\".*$" _exprtk_version_match "${_exprtk_version_line}")

5
ports/vtk/libproj.patch
View File

@ -2,8 +2,9 @@ diff --git a/ThirdParty/libproj/CMakeLists.txt b/ThirdParty/libproj/CMakeLists.t
index f8888876..d57c4c18 100644
--- a/ThirdParty/libproj/CMakeLists.txt
+++ b/ThirdParty/libproj/CMakeLists.txt
@@ -4,10 +4,12 @@ vtk_module_third_party(
VERSION "8.1.0"
@@ -4,11 +4,13 @@ vtk_module_third_party(
VERSION
"8.1.0"
STANDARD_INCLUDE_DIRS
EXTERNAL
- PACKAGE LibPROJ

40
ports/vtk/missing-include-fixes.patch
View File

@ -1,40 +0,0 @@
diff --git a/IO/Image/vtkSEPReader.cxx b/IO/Image/vtkSEPReader.cxx
index 2b15bc249e..cec84d1712 100644
--- a/IO/Image/vtkSEPReader.cxx
+++ b/IO/Image/vtkSEPReader.cxx
@@ -34,7 +34,6 @@
#include <vtksys/SystemTools.hxx>
#include <algorithm>
-#include <cstdint>
namespace details
{
diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h
index 83d127a41e..bdb33a258b 100644
--- a/IO/Image/vtkSEPReader.h
+++ b/IO/Image/vtkSEPReader.h
@@ -25,8 +25,9 @@
#include "vtkImageAlgorithm.h"
#include "vtkNew.h" // for ivars
-#include <array> // for std::array
-#include <string> // for std::string
+#include <array> // for std::array
+#include <cstdint> // for std::uint8_t
+#include <string> // for std::string
namespace details
{
diff --git a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
index 6267684218..cf19b83af4 100644
--- a/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
+++ b/ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp
@@ -31,6 +31,7 @@
/*! @cond Doxygen_Suppress */
+#include <cstdint>
#include <vector>
#include <string>

33
ports/vtk/ot-dep.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/Filters/OpenTURNS/CMakeLists.txt b/Filters/OpenTURNS/CMakeLists.txt
index 8bbc0cd..729e323 100644
--- a/Filters/OpenTURNS/CMakeLists.txt
+++ b/Filters/OpenTURNS/CMakeLists.txt
@@ -1,9 +1,11 @@
-find_package(OpenTURNS 1.8 REQUIRED)
+vtk_module_find_package( PRIVATE_IF_SHARED
+ PACKAGE OpenTURNS
+ VERSION 1.12
+)
-if (EXISTS "${OPENTURNS_USE_FILE}")
- # removed in 1.21
- include (${OPENTURNS_USE_FILE})
-endif ()
+if(NOT TARGET OT)
+ message(FATAL_ERROR "OpenTURNS OT target not available")
+endif()
set(classes
vtkOTDensityMap
@@ -28,8 +30,7 @@ vtk_module_add_module(VTK::FiltersOpenTURNS
vtk_module_link(VTK::FiltersOpenTURNS
PRIVATE
- ${OPENTURNS_LIBRARIES})
-vtk_module_include(VTK::FiltersOpenTURNS
- PRIVATE
- ${OPENTURNS_INCLUDE_DIRS})
+ OT
+)
+
vtk_add_test_mangling(VTK::FiltersOpenTURNS)

89
ports/vtk/pegtl.patch
View File

@ -46,8 +46,9 @@ diff --git a/ThirdParty/pegtl/CMakeLists.txt b/ThirdParty/pegtl/CMakeLists.txt
index 9bbd4c828..0cdb1f53d 100644
--- a/ThirdParty/pegtl/CMakeLists.txt
+++ b/ThirdParty/pegtl/CMakeLists.txt
@@ -5,7 +5,6 @@ vtk_module_third_party(
VERSION "2.8.3"
@@ -5,8 +5,7 @@ vtk_module_third_party(
VERSION
"2.8.3"
EXTERNAL
PACKAGE PEGTL
- VERSION 2.0.0
@ -58,15 +59,10 @@ diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake
index 73eee02f7..22d8bc159 100644
--- a/CMake/FindPEGTL.cmake
+++ b/CMake/FindPEGTL.cmake
@@ -19,31 +19,46 @@
# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
@@ -19,31 +19,45 @@
#
# PEGTL::PEGTL
-find_path(PEGTL_INCLUDE_DIR
- NAMES pegtl/version.hpp
- PATH_SUFFIXES tao
- DOC "Path to PEGTL headers")
-mark_as_advanced(PEGTL_INCLUDE_DIR)
+message(STATUS "Searching for PEGTL")
+find_package(PEGTL CONFIG REQUIRED)
+if(TARGET taocpp::pegtl)
@ -80,54 +76,33 @@ index 73eee02f7..22d8bc159 100644
+ target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl)
+ endif()
+else()
+ find_path(PEGTL_INCLUDE_DIR
+ NAMES pegtl/version.hpp
+ PATH_SUFFIXES tao
+ DOC "Path to PEGTL headers")
+ mark_as_advanced(PEGTL_INCLUDE_DIR)
find_path(PEGTL_INCLUDE_DIR
NAMES pegtl/version.hpp
PATH_SUFFIXES tao
DOC "Path to PEGTL headers")
mark_as_advanced(PEGTL_INCLUDE_DIR)
-if (PEGTL_INCLUDE_DIR)
- file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
- REGEX "TAO_PEGTL_VERSION")
- string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
- set(PEGTL_VERSION "${CMAKE_MATCH_1}")
- unset(_pegtl_version_header)
- unset(_pegtl_version_match)
-endif ()
+ if (PEGTL_INCLUDE_DIR)
+ file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
+ REGEX "TAO_PEGTL_VERSION")
+ string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
+ set(PEGTL_VERSION "${CMAKE_MATCH_1}")
+ unset(_pegtl_version_header)
+ unset(_pegtl_version_match)
+ endif ()
if (PEGTL_INCLUDE_DIR)
file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
REGEX "TAO_PEGTL_VERSION")
string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
set(PEGTL_VERSION "${CMAKE_MATCH_1}")
unset(_pegtl_version_header)
unset(_pegtl_version_match)
endif ()
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PEGTL
- REQUIRED_VARS PEGTL_INCLUDE_DIR
- VERSION_VAR PEGTL_VERSION)
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(PEGTL
+ REQUIRED_VARS PEGTL_INCLUDE_DIR
+ VERSION_VAR PEGTL_VERSION)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(PEGTL
REQUIRED_VARS PEGTL_INCLUDE_DIR
VERSION_VAR PEGTL_VERSION)
-if (PEGTL_FOUND)
- set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}")
- if (NOT TARGET PEGTL::PEGTL)
- add_library(PEGTL::PEGTL INTERFACE IMPORTED)
- set_target_properties(PEGTL::PEGTL PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}")
- endif ()
-endif ()
+ if (PEGTL_FOUND)
+ set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}")
+ if (NOT TARGET PEGTL::PEGTL)
+ add_library(PEGTL::PEGTL INTERFACE IMPORTED)
+ set_target_properties(PEGTL::PEGTL PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}")
+ endif ()
+ message(STATUS "Searching for PEGTL - found")
+ endif ()
if (PEGTL_FOUND)
set(PEGTL_INCLUDE_DIRS "${PEGTL_INCLUDE_DIR}")
if (NOT TARGET PEGTL::PEGTL)
add_library(PEGTL::PEGTL INTERFACE IMPORTED)
set_target_properties(PEGTL::PEGTL PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${PEGTL_INCLUDE_DIR}")
endif ()
endif ()
+endif ()
\ No newline at end of file

82
ports/vtk/portfile.cmake
View File

@ -1,38 +1,17 @@
set(VTK_SHORT_VERSION 9.2)
set(VTK_SHORT_VERSION 9.3)
if(NOT VCPKG_TARGET_IS_WINDOWS)
message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n")
endif()
set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
vcpkg_download_distfile(
STRING_PATCH
URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff?full_index=1
FILENAME vtk-string-bfa3e4.diff
SHA512 c5ccb1193e4e61cf78b63802f87ffb09349c5566ad8a4d51418133953f7acd6b4a206f8d41a426a9eb9be3cf1fd95242e6402973252d7979e5a9cb5e5e480d78
)
vcpkg_download_distfile(
MPI4PY_PATCH_1
URLS https://gitlab.kitware.com/vtk/vtk/-/commit/c938d30634a284fad026f6ae25c30bc84cadc07e.diff?full_index=1
FILENAME vtk-mpi4py-update-part1-c938d3.diff
SHA512 5704c1dd124075bd8f37b0734c5cebd48b470902c74bc23774fd4b69025dbc6bfddf48b7c4511520ed07f03bd666a444d6390569f02a0ab68b5d966ddde3a989
)
vcpkg_download_distfile(
MPI4PY_PATCH_2
URLS https://gitlab.kitware.com/vtk/vtk/-/commit/53e6ce92ae4591552e7e00344d69803117d56bfe.diff?full_index=1
FILENAME vtk-mpi4py-update-part2-53e6ce.diff
SHA512 794a25bff6168fda94d920a6837c3a690bd6d79284ec34dcd67666c55de78962cc7b73c0f074ce58ed78198bb149eab6bf59b2822f29cbfa792e2fe667c9327c
)
# =============================================================================
# Clone & patch
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Kitware/VTK
REF 66143ef041b980a51e41ee470d053e67209150f8 # v9.2.x used by ParaView 5.11.0
SHA512 70662670622082bb8d8b16765bbdf645cfbe62151e93b9673c6f94b356df66ca003e5c78b45e99385f1630aed39c3a8eddecd1d9f5bc0cfb92f5e7e8c06e4dbb
REF 407d4b541111686c40fa53935e7d22c70d5a3f7c # v9.3.x used by ParaView 5.12.0
SHA512 4170d8b6e89ad90020b16d38d6e91c144eb4f1ffd6d6b82a5f2827bf5b16dac98896fcf1a57822bdb56470f56df02adb05836ce98871b779e4733e2cd60a9a76
HEAD_REF master
PATCHES
FindLZMA.patch
@ -52,12 +31,13 @@ vcpkg_from_github(
vtkioss.patch
jsoncpp.patch
iotr.patch
"${STRING_PATCH}"
"${MPI4PY_PATCH_1}"
"${MPI4PY_PATCH_2}"
9690.diff
missing-include-fixes.patch
fast-float.patch
fix-exprtk.patch # just for dbow2 and theia
devendor_exodusII.patch
ot-dep.patch
remove-prefix-changes.patch
10945.diff
10972.diff
)
# =============================================================================
@ -111,6 +91,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS
"paraview" VTK_MODULE_ENABLE_VTK_RenderingVolumeAMR
"paraview" VTK_MODULE_ENABLE_VTK_IOXdmf2
"paraview" VTK_MODULE_ENABLE_VTK_IOH5part
"paraview" VTK_MODULE_ENABLE_VTK_IOH5Rage
"paraview" VTK_MODULE_ENABLE_VTK_IOParallelLSDyna
"paraview" VTK_MODULE_ENABLE_VTK_IOTRUCHAS
"paraview" VTK_MODULE_ENABLE_VTK_IOVPIC
@ -118,6 +99,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS
"paraview" VTK_MODULE_ENABLE_VTK_DomainsChemistry
"paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2
"paraview" VTK_MODULE_ENABLE_VTK_cli11
"paraview" VTK_MODULE_ENABLE_VTK_FiltersOpenTURNS
"paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelVerdict
"paraview" VTK_MODULE_ENABLE_VTK_IOOMF
"paraview" VTK_MODULE_ENABLE_VTK_IOPIO
"mpi" VTK_GROUP_ENABLE_MPI
"opengl" VTK_MODULE_ENABLE_VTK_ImagingOpenGL2
"opengl" VTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2
@ -133,7 +118,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS
list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=ON" "=YES")
list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=OFF" "=DONT_WANT")
if("qt" IN_LIST FEATURES AND NOT EXISTS "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt5/bin/qmlplugindump${VCPKG_HOST_EXECUTABLE_SUFFIX}")
if("qt" IN_LIST FEATURES AND NOT EXISTS "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmlplugindump${VCPKG_HOST_EXECUTABLE_SUFFIX}")
list(APPEND VTK_FEATURE_OPTIONS -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick=NO)
endif()
if("qt" IN_LIST FEATURES)
@ -147,19 +132,19 @@ endif()
if("python" IN_LIST FEATURES)
set(python_ver "")
if(NOT VCPKG_TARGET_IS_WINDOWS)
file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
file(GLOB _py3_include_path "${CURRENT_INSTALLED_DIR}/include/python3*")
string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path})
set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
set(python_ver "3.${PYTHON_VERSION_MINOR}")
endif()
list(APPEND ADDITIONAL_OPTIONS
-DVTK_WRAP_PYTHON=ON
-DVTK_PYTHON_VERSION=3
-DPython3_FIND_REGISTRY=NEVER
"-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}"
"-DPython3_EXECUTABLE:PATH=${CURRENT_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}"
-DVTK_MODULE_ENABLE_VTK_Python=YES
-DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES # TODO: recheck
-DVTK_MODULE_ENABLE_VTK_PythonInterpreter=YES
-DVTK_PYTHON_SITE_PACKAGES_SUFFIX=${PYTHON3_SITE}
)
#VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
endif()
@ -177,12 +162,15 @@ endif()
if ("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES)
list(APPEND ADDITIONAL_OPTIONS
-DVTK_MODULE_ENABLE_VTK_WebCore=YES
-DVTK_MODULE_ENABLE_VTK_WebPython=YES
-DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES
)
endif()
if("paraview" IN_LIST FEATURES AND "mpi" IN_LIST FEATURES)
list(APPEND ADDITIONAL_OPTIONS
-DVTK_MODULE_ENABLE_VTK_FiltersParallelFlowPaths=YES
-DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC=YES
)
endif()
@ -244,6 +232,7 @@ vcpkg_cmake_configure(
# Select modules / groups to install
-DVTK_USE_EXTERNAL:BOOL=ON
-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG
-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF # Not yet in VCPKG
#-DVTK_MODULE_ENABLE_VTK_jsoncpp=YES
${ADDITIONAL_OPTIONS}
-DVTK_DEBUG_MODULE_ALL=ON
@ -329,9 +318,13 @@ foreach(TOOL_NAME IN LISTS VTK_TOOLS)
_vtk_move_release_tool("${TOOL_NAME}")
endforeach()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin")
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vtktoken-9.3.dll" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# vendored "token" library can be only build as a shared library
set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
@ -341,20 +334,7 @@ vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk")
## Files Modules needed by ParaView
if("paraview" IN_LIST FEATURES)
set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType
vtkSupportMacros vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData)
foreach(module ${VTK_CMAKE_NEEDED})
file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
endforeach()
## Check List on UPDATE !!
file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/Parallel/vtkCompositeZPassFS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
file(INSTALL "${SOURCE_PATH}/Rendering/ParallelLIC/vtkMPIPixelView.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@ -392,3 +372,5 @@ endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)
# Handle copyright
file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtk/VTK-vtk-module-properties.cmake" "_vtk_module_import_prefix}/lib/vtk-9.3/hierarchy" "_vtk_module_import_prefix}$<$<CONFIG:Debug>:/debug>/lib/vtk-9.3/hierarchy")

27
ports/vtk/pythonwrapper.patch
View File

@ -2,13 +2,25 @@ diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake
index 5d2c2e1bf..e33a16d68 100644
--- a/CMake/vtkModuleWrapPython.cmake
+++ b/CMake/vtkModuleWrapPython.cmake
@@ -152,11 +152,14 @@ function (_vtk_module_wrap_python_sources module sources classes)
set(_vtk_python_genex_compile_definitions
"$<TARGET_PROPERTY:${_vtk_python_target_name},COMPILE_DEFINITIONS>")
set(_vtk_python_genex_include_directories
"$<TARGET_PROPERTY:${_vtk_python_target_name},INCLUDE_DIRECTORIES>")
+ set(_vtk_python_genex_interface_include_directories
+ "$<TARGET_PROPERTY:${_vtk_python_target_name},INTERFACE_INCLUDE_DIRECTORIES>")
@@ -152,23 +152,26 @@ function (_vtk_module_wrap_python_sources module sources classes)
set(_vtk_python_genex_compile_definitions "")
set(_vtk_python_genex_include_directories "")
if (_vtk_python_genex_allowed)
set(_vtk_python_genex_compile_definitions
"$<TARGET_PROPERTY:${_vtk_python_target_name},COMPILE_DEFINITIONS>")
set(_vtk_python_genex_include_directories
"$<TARGET_PROPERTY:${_vtk_python_target_name},INCLUDE_DIRECTORIES>")
+ set(_vtk_python_genex_interface_include_directories
+ "$<TARGET_PROPERTY:${_vtk_python_target_name},INTERFACE_INCLUDE_DIRECTORIES>")
else ()
if (NOT DEFINED ENV{CI})
message(AUTHOR_WARNING
"Python wrapping is not using target-local compile definitions or "
"include directories. This may affect generation of the Python "
"wrapper sources for the ${module} module. Use CMake 3.19+ to "
"guarantee intended behavior.")
endif ()
endif ()
file(GENERATE
OUTPUT "${_vtk_python_args_file}"
CONTENT "$<$<BOOL:${_vtk_python_genex_compile_definitions}>:\n-D\'$<JOIN:${_vtk_python_genex_compile_definitions},\'\n-D\'>\'>\n
@ -17,3 +29,4 @@ index 5d2c2e1bf..e33a16d68 100644
$<$<BOOL:${_vtk_python_hierarchy_files}>:\n--types \'$<JOIN:${_vtk_python_hierarchy_files},\'\n--types \'>\'>\n")
set(_vtk_python_sources)

11
ports/vtk/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "vtk",
"version-semver": "9.2.0-pv5.11.0",
"port-version": 12,
"version-semver": "9.3.0-pv5.12.0",
"description": "Software system for 3D computer graphics, image processing, and visualization",
"homepage": "https://github.com/Kitware/VTK",
"license": "BSD-3-Clause",
@ -10,6 +9,7 @@
"eigen3",
"expat",
"exprtk",
"fast-float",
"fmt",
"freetype",
"glew",
@ -167,6 +167,7 @@
"description": "Build vtk modules required by paraview",
"dependencies": [
"cli11",
"openturns",
{
"name": "vtk",
"default-features": false,
@ -187,11 +188,7 @@
"python": {
"description": "Python functionality for VTK",
"dependencies": [
"python3",
{
"name": "python3",
"host": true
}
"python3"
]
},
"qt": {

42
ports/vtk/vtkioss.patch
View File

@ -1,33 +1,3 @@
diff --git a/IO/IOSS/vtkIOSSReader.cxx b/IO/IOSS/vtkIOSSReader.cxx
index 34218f0a6..226896a9e 100644
--- a/IO/IOSS/vtkIOSSReader.cxx
+++ b/IO/IOSS/vtkIOSSReader.cxx
@@ -1343,20 +1343,20 @@ Ioss::Region* vtkIOSSReader::vtkInternals::GetRegion(const std::string& dbasenam
{
switch (properties.get(name).get_type())
{
- case vtkioss_Ioss::Property::BasicType::POINTER:
+ case Ioss::Property::BasicType::POINTER:
vtkLog(TRACE, << name << " : " << properties.get(name).get_pointer());
break;
- case vtkioss_Ioss::Property::BasicType::INTEGER:
+ case Ioss::Property::BasicType::INTEGER:
vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_int()));
break;
- case vtkioss_Ioss::Property::BasicType::INVALID:
+ case Ioss::Property::BasicType::INVALID:
vtkLog(TRACE, << name << " : "
<< "invalid type");
break;
- case vtkioss_Ioss::Property::BasicType::REAL:
+ case Ioss::Property::BasicType::REAL:
vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_real()));
break;
- case vtkioss_Ioss::Property::BasicType::STRING:
+ case Ioss::Property::BasicType::STRING:
vtkLog(TRACE, << name << " : " << properties.get(name).get_string());
break;
default:
diff --git a/ThirdParty/ioss/CMakeLists.txt b/ThirdParty/ioss/CMakeLists.txt
index 3066c4bb5..44e1eb1bf 100644
--- a/ThirdParty/ioss/CMakeLists.txt
@ -41,3 +11,15 @@ index 3066c4bb5..44e1eb1bf 100644
USE_VARIABLES SEACASIoss_INCLUDE_DIRS
STANDARD_INCLUDE_DIRS)
diff --git a/IO/IOSS/vtkIOSSReader.cxx b/IO/IOSS/vtkIOSSReader.cxx
index 04de56cb20..b905e84a3e 100644
--- a/IO/IOSS/vtkIOSSReader.cxx
+++ b/IO/IOSS/vtkIOSSReader.cxx
@@ -61,6 +61,7 @@
#include VTK_IOSS(Ioss_SideBlock.h)
#include VTK_IOSS(Ioss_SideSet.h)
#include VTK_IOSS(Ioss_StructuredBlock.h)
+#include VTK_IOSS(Iotr_Factory.h)
// clang-format on
#include <array>

92
ports/vtk/vtkm.patch
View File

@ -2,32 +2,26 @@ diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMak
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)
@@ -1,4 +1,3 @@
-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})
@@ -31,8 +31,5 @@ vtkm_add_target_information(${vtkm_accel_target}
NOWRAP_HEADERS ${nowrap_headers}
NOWRAP_CLASSES ${nowrap_classes}
PRIVATE_HEADERS ${private_headers})
-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)
_vtk_module_real_target(vtkm_accel_target VTK::AcceleratorsVTKmCore)
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 @@
@@ -1,7 +1,6 @@
set(VTKm_NO_DEPRECATED_VIRTUAL ON)
-list(INSERT CMAKE_MODULE_PATH 0
@ -36,23 +30,18 @@ index 9d5dfe100..7fea257b7 100644
set(sources
vtkmlib/ArrayConvertersReal.cxx
@@ -72,10 +71,6 @@ vtkm_add_target_information(${vtkm_accel_target}
MODIFY_CUDA_FLAGS
DEVICE_SOURCES ${sources})
@@ -40,6 +39,3 @@ vtkm_add_target_information(${vtkm_accel_target}
NOWRAP_CLASSES ${nowrap_classes}
PRIVATE_HEADERS ${private_headers})
-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
_vtk_module_real_target(vtkm_accel_target VTK::AcceleratorsVTKmDataModel)
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 @@
@@ -1,7 +1,6 @@
set(VTKm_NO_DEPRECATED_VIRTUAL ON)
-list(INSERT CMAKE_MODULE_PATH 0
@ -61,16 +50,14 @@ index 0f51c436d..567b49197 100644
set(classes
vtkmAverageToCells
@@ -118,9 +117,6 @@ vtkm_add_target_information(${vtkm_accel_target}
MODIFY_CUDA_FLAGS
DEVICE_SOURCES ${sources})
@@ -91,7 +90,4 @@ vtkm_add_target_information(${vtkm_accel_target}
HEADERS ${headers}
CLASSES ${classes})
-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
@ -90,29 +77,31 @@ 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 @@
@@ -1,15 +1,34 @@
-vtk_module_third_party_internal(
- LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt"
- VERSION "1.7.1"
- SUBDIRECTORY vtkvtkm
- LICENSE_FILES
- "vtkvtkm/vtk-m/LICENSE.txt"
- SPDX_LICENSE_IDENTIFIER
- "BSD-3-Clause"
- SPDX_COPYRIGHT_TEXT
- "Copyright (c) 2014-2023 Kitware Inc., National Technology & Engineering Solutions of Sandia, LLC (NTESS),"
- "UT-Battelle, LLC., Los Alamos National Security, LLC."
- SPDX_DOWNLOAD_LOCATION
- "git+https://gitlab.kitware.com/vtk/vtk-m.git@2.0.0@v2.0.0"
- VERSION
- "2.0.0"
- 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)
+ 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)
+ get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm::vtkmdiy INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm::optionparser INTERFACE_INCLUDE_DIRECTORIES)
+ if(MSVC)
+ set(VTKm_DEFINITIONS /bigobj)
+ endif()
@ -134,7 +123,7 @@ index 8cfbf92b0..ad78cc8f5 100644
+ INTERFACE
+ EXTERNAL
+ PACKAGE VTKm
+ TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
+ TARGETS vtkm::cont vtkm::filter vtkm::vtkmdiy vtkm::optionparser
+ #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple
+ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS
+)
@ -151,3 +140,18 @@ index a8e4dad0f..c7bbbf0e8 100644
+LIBRARY_NAME
+ VTKm
THIRD_PARTY
diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt
index 7c1b10410c..610bf831fb 100644
--- a/Accelerators/Vtkm/Filters/CMakeLists.txt
+++ b/Accelerators/Vtkm/Filters/CMakeLists.txt
@@ -91,8 +91,8 @@ vtk_module_add_module(VTK::AcceleratorsVTKmFilters
CLASSES ${classes})
vtk_module_link(VTK::AcceleratorsVTKmFilters
PRIVATE
- vtkm_worklet
- vtkm_filter)
+ vtkm::worklet
+ vtkm::filter)
vtk_module_definitions(VTK::AcceleratorsVTKmFilters
PUBLIC "VTK_ENABLE_VTKM_OVERRIDES=$<BOOL:${VTK_ENABLE_VTKM_OVERRIDES}>")

1
scripts/ci.baseline.txt
View File

@ -1322,6 +1322,7 @@ vcpkg-ci-openimageio:x64-osx=pass
vcpkg-ci-openimageio:x64-linux=pass
vcpkg-ci-paraview:x64-linux=pass
vcpkg-ci-paraview:x64-osx=pass
vcpkg-ci-paraview:arm64-osx=pass
vcpkg-ci-paraview:x64-windows-static-md=pass
vcpkg-ci-paraview:x64-windows-static=pass
vcpkg-ci-paraview:x64-windows=pass

16
versions/baseline.json
View File

@ -4070,7 +4070,7 @@
},
"lapack-reference": {
"baseline": "3.11.0",
"port-version": 5
"port-version": 6
},
"lastools": {
"baseline": "2.0.2+20230206",
@ -6494,7 +6494,7 @@
},
"openmvs": {
"baseline": "2.1.0",
"port-version": 3
"port-version": 4
},
"openni2": {
"baseline": "2.2.0.33",
@ -6657,8 +6657,8 @@
"port-version": 3
},
"paraview": {
"baseline": "5.11.0",
"port-version": 5
"baseline": "5.12.0",
"port-version": 0
},
"parmetis": {
"baseline": "2022-07-27",
@ -9177,16 +9177,16 @@
"port-version": 1
},
"vtk": {
"baseline": "9.2.0-pv5.11.0",
"port-version": 12
"baseline": "9.3.0-pv5.12.0",
"port-version": 0
},
"vtk-dicom": {
"baseline": "0.8.14",
"port-version": 2
},
"vtk-m": {
"baseline": "1.9.0",
"port-version": 2
"baseline": "2.1.0",
"port-version": 0
},
"vulkan": {
"baseline": "2023-12-17",

5
versions/l-/lapack-reference.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c6447c2a6f70504bfbf20f2e649bcc17a6ce67de",
"version": "3.11.0",
"port-version": 6
},
{
"git-tree": "27fda0472d5bfb11fef0264ba62681f6d6b4b1d2",
"version": "3.11.0",

5
versions/o-/openmvs.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e6f7599f84f4b26667f18c785883c8c341886e18",
"version": "2.1.0",
"port-version": 4
},
{
"git-tree": "14cc4ac41f5710b5281e06697ac6e6cd7800377f",
"version": "2.1.0",

5
versions/p-/paraview.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2a5437265d59f394fd71329e0ea2e16fef5cd516",
"version": "5.12.0",
"port-version": 0
},
{
"git-tree": "2dbdde07d29c13b69e83fb0a022568b3c20c4b4c",
"version": "5.11.0",

5
versions/v-/vtk-m.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3dff65b6415effb270b42e8d744689f35559abbc",
"version": "2.1.0",
"port-version": 0
},
{
"git-tree": "1d9c1ecc2af5787432fdebcdf6cd293b7af075bf",
"version": "1.9.0",

5
versions/v-/vtk.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa0dbd73659c3eda9ccce23fe3008683b1a8ec38",
"version-semver": "9.3.0-pv5.12.0",
"port-version": 0
},
{
"git-tree": "9f1473cbde3a447a1068779a42704a92b8eecccb",
"version-semver": "9.2.0-pv5.11.0",