diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a69398e1c06817901768cf3ca54e325b03f82a1e..7e69b47d36452d78bbaec5557983f0034501ea42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,6 +159,13 @@ ubuntu-24-prepare: image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:24.04 script: - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=ubuntu-24.04-llvm-full + artifacts: + untracked: false + when: on_success + access: all + expire_in: 24 hrs + paths: + - xdk/lib/python3/* ubuntu-22-build: extends: .common-build @@ -184,7 +191,6 @@ ubuntu-24-gdal-bindings: refs: - /^release-[0-9]+\.[0-9]+$/ script: - - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=ubuntu-24.04-llvm-xdk-full -Dci_skip_testing:BOOL=ON - find xdk/lib/python3/dist-packages/osgeo/ -type f -name "*.so" -printf "%P\n" | tar -czf OTB-GDAL-bindings-py312.tar.gz --no-recursion -C xdk/lib/python3/dist-packages/osgeo -T - needs: - job: ubuntu-24-prepare diff --git a/CMake/OTBModuleMacros.cmake b/CMake/OTBModuleMacros.cmake index a6b967b88af5e7ba0a66b7cd0533154a458b70bd..61a9afc916e1c3f09f34c8891bcee3421ba668a7 100644 --- a/CMake/OTBModuleMacros.cmake +++ b/CMake/OTBModuleMacros.cmake @@ -201,7 +201,6 @@ macro(otb_module_impl) if(${otb-module}_SYSTEM_LIBRARY_DIRS) link_directories(${${otb-module}_SYSTEM_LIBRARY_DIRS}) - message(STATUS "Link directory for ${otb-module} : " ${${otb-module}_SYSTEM_LIBRARY_DIRS}) endif() if(${otb-module}_THIRD_PARTY) diff --git a/Modules/ThirdParty/ITK/CMakeLists.txt b/Modules/ThirdParty/ITK/CMakeLists.txt index 3e241bae1dde4b5ff567cc265e041d8b21fbafa5..d9d30b8f0dfb2e4bbe6f803bd30ce28bff3465de 100644 --- a/Modules/ThirdParty/ITK/CMakeLists.txt +++ b/Modules/ThirdParty/ITK/CMakeLists.txt @@ -24,7 +24,6 @@ set(OTBITK_SYSTEM_INCLUDE_DIRS ${ITK_INCLUDE_DIRS}) set(OTBITK_SYSTEM_LIBRARY_DIRS ${ITK_LIBRARY_DIRS}) list(REMOVE_DUPLICATES OTBITK_SYSTEM_LIBRARY_DIRS) set(OTBITK_LIBRARIES "${ITK_LIBRARIES}" ${FFTWD_BASE_LIB} ${FFTWD_THREADS_LIB} ${FFTWF_BASE_LIB} ${FFTWF_THREADS_LIB}) -message(STATUS "OTBITK_LIBRARIES : " ${OTBITK_LIBRARIES}) set(OTBITK_EXPORT_CODE_BUILD "find_package(ITK REQUIRED COMPONENTS ${OTBITK_ITK_REQUIRED_MODULE_LIST} HINTS ${ITK_DIR})") set(OTBITK_EXPORT_CODE_INSTALL ${OTBITK_EXPORT_CODE_BUILD})