Skip to content
Snippets Groups Projects
Commit 7024cad2 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

CI: simplify gdal bindings build and delete debug messages

parent 297867d8
No related branches found
No related tags found
1 merge request!528Support of ITK 5.x in OTB
......@@ -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
......
......@@ -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)
......
......@@ -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})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment