From 69cc0caeaa4e9f65f587502609e171d7e9aef4e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com>
Date: Thu, 27 Mar 2025 17:30:22 +0100
Subject: [PATCH] [refact] Library will now be install under
 paraview-<version>/plugin folder

---
 .gitlab/linux-5.13.yml   | 4 ++--
 .gitlab/linux-common.yml | 2 +-
 .gitlab/windows-5.13.yml | 8 ++++++--
 CMakeLists.txt           | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab/linux-5.13.yml b/.gitlab/linux-5.13.yml
index 3ee69cb..33f8231 100644
--- a/.gitlab/linux-5.13.yml
+++ b/.gitlab/linux-5.13.yml
@@ -1,7 +1,7 @@
 .binary_5_13:
   image: gitlab.kitware.com:4567/lidarview/lidarview/plugins/pcl-plugin:ci-pv-plugin-5.13-20250326
   variables:
-    PARAVIEW_VERSION: "5.13.0"
+    PARAVIEW_VERSION: "5.13"
 
 linux_v5.13.0_artifact:build:
   stage: build
@@ -22,7 +22,7 @@ linux_v5.13.0_artifact:package:
 .v5_13:
   image: gitlab.kitware.com:4567/lidarview/lidarview/plugins/pcl-plugin:ci-pv-5.13-20250326
   variables:
-    PARAVIEW_VERSION: "5.13.0"
+    PARAVIEW_VERSION: "5.13"
 
 linux_v5.13.0:build:
   stage: build
diff --git a/.gitlab/linux-common.yml b/.gitlab/linux-common.yml
index 6260be0..f7005ca 100644
--- a/.gitlab/linux-common.yml
+++ b/.gitlab/linux-common.yml
@@ -52,7 +52,7 @@
   before_script:
     - source /opt/rh/devtoolset-7/enable
   script:
-    - cp $CI_PROJECT_DIR/build/lib64/pclplugin/plugins/PCLPlugin/PCLPlugin.so $CI_PROJECT_DIR/PCLPlugin.so
+    - cp $CI_PROJECT_DIR/build/lib64/paraview-$PARAVIEW_VERSION/plugins/PCLPlugin/PCLPlugin.so $CI_PROJECT_DIR/PCLPlugin.so
 
 .build_plugin:
   extends:
diff --git a/.gitlab/windows-5.13.yml b/.gitlab/windows-5.13.yml
index aecf208..04c9ad3 100644
--- a/.gitlab/windows-5.13.yml
+++ b/.gitlab/windows-5.13.yml
@@ -50,6 +50,8 @@
 
 windows_v5.13.1:build:
   stage: build
+  variables:
+    PARAVIEW_VERSION: "5.13"
   extends:
     - .windows_vs2019
     - .windows_builder_tags
@@ -65,6 +67,8 @@ windows_v5.13.1:build:
 
 windows_v5.13.1:package:
   stage: package
+  variables:
+    PARAVIEW_VERSION: "5.13"
   extends:
     - .windows_vs2019
     - .windows_test_tags
@@ -72,8 +76,8 @@ windows_v5.13.1:package:
     - .run_automatically
   script:
     - *before_script_windows
-    - cmake -DLVSB_DIR="$LVSB_PATH" -DDESTINATION_DIR="$CI_PROJECT_DIR/build/bin/pclplugin/plugins/PCLPlugin/" -P .gitlab/ci/copy_deps_dlls.cmake
-    - Compress-Archive -Path "$CI_PROJECT_DIR/build/bin/pclplugin/plugins/PCLPlugin/" -DestinationPath "$CI_PROJECT_DIR/PCLPlugin.zip"
+    - cmake -DLVSB_DIR="$LVSB_PATH" -DDESTINATION_DIR="$CI_PROJECT_DIR/build/bin/paraview-$PARAVIEW_VERSION/plugins/PCLPlugin/" -P .gitlab/ci/copy_deps_dlls.cmake
+    - Compress-Archive -Path "$CI_PROJECT_DIR/build/bin/paraview-$PARAVIEW_VERSION/plugins/PCLPlugin/" -DestinationPath "$CI_PROJECT_DIR/PCLPlugin.zip"
   dependencies:
     - windows_v5.13.1:build
   needs:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49c353a..4feee0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ paraview_plugin_build(
   HEADERS_DESTINATION  "${CMAKE_INSTALL_INCLUDEDIR}"
   RUNTIME_DESTINATION  "${CMAKE_INSTALL_BINDIR}"
   LIBRARY_DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
-  LIBRARY_SUBDIRECTORY "pclplugin/plugins"
+  LIBRARY_SUBDIRECTORY "${PARAVIEW_PLUGIN_SUBDIR}"
   PLUGINS_FILE_NAME    "pclplugin.plugins.xml"
   TARGET               PCLPlugin::paraview_plugin
   INSTALL_EXPORT       PCLPlugin
-- 
GitLab