From 4bb70cf34011bfaf6a5cde7e680a5eb3f6d824f4 Mon Sep 17 00:00:00 2001 From: Cory Quammen Date: Sat, 8 Feb 2025 13:02:27 -0500 Subject: [PATCH 1/3] cinemaexport: update to latest plugin source code --- projects/cinemaexport.cmake | 1 + versions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/cinemaexport.cmake b/projects/cinemaexport.cmake index 08f3c19f6..d4c5eedea 100644 --- a/projects/cinemaexport.cmake +++ b/projects/cinemaexport.cmake @@ -10,4 +10,5 @@ superbuild_add_project(cinemaexport CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DCMAKE_INSTALL_LIBDIR:PATH=lib + -DUSE_EMBREE3:BOOL=ON ) diff --git a/versions.cmake b/versions.cmake index 565e1dbb2..a4786c03d 100644 --- a/versions.cmake +++ b/versions.cmake @@ -83,8 +83,8 @@ superbuild_set_revision(vortexfinder2 superbuild_set_revision(cinemaexport # https://github.com/cinemascience/cinema-paraview-plugin - URL "https://www.paraview.org/files/dependencies/cinema-paraview-plugin-237dd6bdb14a25249790b7721e1e613e81754f7a.zip" - URL_MD5 29cefcd66ce139c63c19abf1abe34585) + URL "https://www.paraview.org/files/dependencies/cinema-paraview-plugin-f6de62859beb7e0cd75ba07e5e8ddf3a906e387a.zip" + URL_MD5 a50146275e488c84d7b52778ba71dd76) superbuild_set_revision(surfacetrackercut # https://github.com/conniejhe/Surface-Cutting -- GitLab From 876b11d1c8ff761a9f9adb2525ed6ac63fe32887 Mon Sep 17 00:00:00 2001 From: Cory Quammen Date: Thu, 20 Feb 2025 10:49:12 -0500 Subject: [PATCH 2/3] cinemaexport: set the install rpath to leave room for rewriting it --- projects/cinemaexport.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/cinemaexport.cmake b/projects/cinemaexport.cmake index d4c5eedea..0250a3a77 100644 --- a/projects/cinemaexport.cmake +++ b/projects/cinemaexport.cmake @@ -10,5 +10,6 @@ superbuild_add_project(cinemaexport CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DCMAKE_INSTALL_LIBDIR:PATH=lib + -DCMAKE_INSTALL_RPATH:STRING=/lib -DUSE_EMBREE3:BOOL=ON ) -- GitLab From 2c8f82d9dfd8f9c050b3ecb64d27ac1fa0d06c91 Mon Sep 17 00:00:00 2001 From: Cory Quammen Date: Fri, 21 Feb 2025 08:40:15 -0500 Subject: [PATCH 3/3] openturns: set CMAKE_INSTALL_* variables * Explicitly set CMAKE_INSTALL_RPATH to the installation directory. * Set CMAKE_INSTALL_LIBDIR to put the openturns .so file in the expected lib location. --- projects/openturns.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/openturns.cmake b/projects/openturns.cmake index 4ec9c4635..7c61d7446 100644 --- a/projects/openturns.cmake +++ b/projects/openturns.cmake @@ -31,6 +31,8 @@ superbuild_add_project(openturns CMAKE_ARGS -DBUILD_PYTHON=OFF -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} + -DCMAKE_INSTALL_RPATH:STRING=/lib + -DCMAKE_INSTALL_LIBDIR:STRING=lib -DBUILD_TESTING=OFF -DUSE_BISON=OFF -DUSE_BONMIN=OFF -- GitLab