From a78143b94fcc589eee2c2d71abf216a7f6258c16 Mon Sep 17 00:00:00 2001
From: Tristan Laurent <tristan.laurent@cs-soprasteria.com>
Date: Fri, 10 Jan 2025 16:54:18 +0100
Subject: [PATCH] CI: force XDK_INSTALL_PATH cmake option for windows build
---
CI/windows-10-x64-vc14.29.cmake | 9 +++++++++
CMakeLists.txt | 6 ------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CI/windows-10-x64-vc14.29.cmake b/CI/windows-10-x64-vc14.29.cmake
index 2c902ec86c..43e49b5b51 100644
--- a/CI/windows-10-x64-vc14.29.cmake
+++ b/CI/windows-10-x64-vc14.29.cmake
@@ -37,3 +37,12 @@ OTB_USE_OPENCV:BOOL=ON
OTB_USE_OPENMP:BOOL=OFF
OTB_USE_SHARK:BOOL=ON
")
+
+# As windows have a dumb dynamic linkage system, we need to use
+# the XDK_INSTALL_PATH option to ensure dlls are copied from xdk to otb bin
+# folder
+if(XDK_INSTALL_PATH)
+ set(site_option
+"XDK_INSTALL_PATH=${XDK_INSTALL_PATH}
+${site_option}")
+endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f9209fc49..473055c2bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,12 +394,6 @@ if(XDK_INSTALL_PATH)
DESTINATION .
USE_SOURCE_PERMISSIONS
COMPONENT Core)
- if (WIN32)
- install(DIRECTORY ${XDK_INSTALL_PATH}/bin
- DESTINATION ${OTB_INSTALL_PREFIX}
- USE_SOURCE_PERMISSIONS
- COMPONENT Core)
- endif()
install(DIRECTORY ${XDK_INSTALL_PATH}/cmake
DESTINATION ./lib
USE_SOURCE_PERMISSIONS
--
GitLab