From 3ab1a93c45d7a537a23629a6dec13a62ec8c8598 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 4 Jan 2025 23:47:48 +0100 Subject: [PATCH 1/4] vtkonly: keep system cflags from pkgconf dependencies This fixes `pkgconf` dropping include paths due to its "system" considerations. As done for `paraview` in b35536c (paraview: tell pkgconf to keep "system" paths, 2024-07-03), via !918. --- projects/vtkonly.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/vtkonly.cmake b/projects/vtkonly.cmake index b8bb362e..c811fb15 100644 --- a/projects/vtkonly.cmake +++ b/projects/vtkonly.cmake @@ -69,6 +69,11 @@ superbuild_add_project(vtkonly -DVTK_UNIFIED_INSTALL_TREE:BOOL=ON -DVTK_DLL_PATHS:STRING=${vtk_dll_paths} + # When a superbuild pkgconf is used, it assumes that its prefix is searched + # for by the toolchain by default. This is not the case, so keep system + # cflags. + -DPKG_CONFIG_ARGN=--keep-system-cflags + -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=${vtkonly_qt_req} # CMB needs geovis enabled to provide the gdal reader -DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=${vtkonly_libarchive_req} -- GitLab From 935ef874efa282dff18bfdc7544dfbcbeb7fa783 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 5 Jan 2025 00:29:54 +0100 Subject: [PATCH 2/4] ci: disable `matplotlib` testing It doesn't seem to work in SMTK anymore (uses deprecated and removed APIs). --- .gitlab/ci/configure_common.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index cda01649..d929e2f2 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -142,13 +142,6 @@ else () set(ENABLE_smtk "ON" CACHE BOOL "") set(ENABLE_smtkresourcemanagerstate "OFF" CACHE BOOL "") - if ("$ENV{CI_JOB_NAME}" MATCHES "centos7") - # matplotlib is not necessary, but this is as good a place as any to test it - set(ENABLE_matplotlib "ON" CACHE BOOL "") - else () - set(ENABLE_matplotlib "OFF" CACHE BOOL "") - endif () - if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "smtk") set(ENABLE_paraview "ON" CACHE BOOL "") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vtk") -- GitLab From aed9246de6b8cdf123dc7d65ad9fb113724c016c Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 5 Jan 2025 09:34:37 +0100 Subject: [PATCH 3/4] paraview: optionally depend on `nlohmannjson` This ensures it is installed before ParaView is configured. --- projects/paraview.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/paraview.cmake b/projects/paraview.cmake index 2e5b6008..fad4aaca 100644 --- a/projects/paraview.cmake +++ b/projects/paraview.cmake @@ -86,7 +86,7 @@ superbuild_add_project(paraview netcdf DEPENDS_OPTIONAL cxx11 hdf5 protobuf las gdal - python3 tbb + python3 tbb nlohmannjson CMAKE_ARGS -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON -DPARAVIEW_BUILD_TESTING:BOOL=OFF -- GitLab From 1320cf268655be08063014b2d064cb3dc324dd9d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 5 Jan 2025 09:35:38 +0100 Subject: [PATCH 4/4] vtkonly: use superbuild's `nlohmannjson` if available This fixes issues with SMTK's classes including both the system `nlohmannjson` and VTK's vendored one by making them agree. --- projects/vtkonly.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/vtkonly.cmake b/projects/vtkonly.cmake index c811fb15..07b30a85 100644 --- a/projects/vtkonly.cmake +++ b/projects/vtkonly.cmake @@ -60,6 +60,7 @@ superbuild_add_project(vtkonly netcdf DEPENDS_OPTIONAL cxx11 freetype gdal libarchive python3 qt5 hdf5 las tbb + nlohmannjson CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=ON -DVTK_BUILD_TESTING:BOOL=OFF @@ -95,6 +96,7 @@ superbuild_add_project(vtkonly -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=${netcdf_enabled} -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=${png_enabled} -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=${zlib_enabled} + -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson:BOOL=${nlohmannjson_enabled} -DVTK_GROUP_ENABLE_Web:STRING=${vtkonly_python_req} -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=${vtk_smp_backend} -- GitLab