Update configuration for version 9.7.0

[tools/configuration.git] / config / patches / paraview.0010-ParaView_CATALYST_cmake.patch

diff --git a/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch b/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch
new file mode 100644 (file)
index 0000000..9c12894
--- /dev/null
+++ b/config/patches/paraview.0010-ParaView_CATALYST_cmake.patch
@@ -0,0 +1,34 @@
+diff -Naur ParaView-5.9.0_ref/CMakeLists.txt ParaView-5.9.0/CMakeLists.txt
+--- ParaView-5.9.0_ref/CMakeLists.txt  2021-02-04 15:22:04.000000000 +0100
++++ ParaView-5.9.0/CMakeLists.txt      2021-03-01 15:48:43.101402815 +0100
+@@ -831,7 +831,7 @@
+ # Test to check that we can process all of the Catalyst editions
+ #------------------------------------------------------------------------------
+ if (BUILD_TESTING AND PARAVIEW_USE_PYTHON AND UNIX AND NOT APPLE)
+-if (FALSE) # XXX(FIXME)
++if (TRUE) # XXX(FIXME)
+   # disabling till we Catalyst editions are fixed post modularization
+   add_test( NAME GenerateCatalystEditions
+     COMMAND ${CMAKE_COMMAND}
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in     2021-03-01 15:51:58.110940810 +0100
+@@ -1,6 +1,6 @@
+ # Catalyst Package config file.
+ cmake_policy(PUSH)
+-cmake_policy(VERSION 3.13)
++cmake_policy(VERSION 3.12)
+ 
+ set(CATALYST_VERSION "@CATALYST_VERSION@")
+ set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt     2021-03-01 15:56:02.640910857 +0100
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
+ project(CATALYST VERSION 2.0 LANGUAGES C CXX)
+ 
+ #------------------------------------------------------------------------------