diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b57c5c2f93e9e28719e97d0c593971a9c86e6d81..2a74d9fa3d745925e162dd04b21c39354513bd76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,7 +184,7 @@ ubuntu-22-build:
 
 # Ubuntu 22 build needed for gdal bindings with python 3.10. We package the compiled bindings for python 3.10, this package will be downloaded and extracted automatically when
 # a user lauches the otbenv profile after unpacking the official archive for the first time (which contains bindings for ubuntu 20 and python 3.8 initially)
-ubuntu-24-gdal-bindings:
+python3.12-gdal-bindings:
   extends: .common-build
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:24.04
   only:
@@ -265,7 +265,7 @@ windows-10-build:
     - ctest -V -S CI/main_superbuild.cmake -DPython_ROOT_DIR:STRING="C:/tools/Python310-x64"
     - buildcache.exe -s
     - .\CI\copy_boost_dlls.ps1
-    - ctest -V -S CI/superbuild_packaging.cmake -DPACKAGE_BY_MODULE:BOOL=OFF
+    - ctest -VV -S CI/superbuild_packaging.cmake -DPACKAGE_BY_MODULE:BOOL=OFF
     - move "build_packages\OTB-*.zip" . || dir build_packages
   needs:
     - job: windows-10-prepare
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc2bd17acba5750ff35ccf6a6e52d3f4379de358..cf1de7a06f06d4a45d9022d4d59707672c2de5ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,10 +379,13 @@ if(XDK_INSTALL_PATH)
             COMPONENT Core
             PATTERN "cmake" EXCLUDE
             )
-    install(DIRECTORY ${XDK_INSTALL_PATH}/share/cmake
-            DESTINATION ./lib
-            USE_SOURCE_PERMISSIONS
-            COMPONENT Core)
+    # On Windows this folder does not exist
+    if( EXISTS ${XDK_INSTALL_PATH}/share/cmake)
+      install(DIRECTORY ${XDK_INSTALL_PATH}/share/cmake
+              DESTINATION ./lib
+              USE_SOURCE_PERMISSIONS
+              COMPONENT Core)
+    endif()
     install(DIRECTORY ${XDK_INSTALL_PATH}/include
             DESTINATION .
             USE_SOURCE_PERMISSIONS