Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
7024cad2
Commit
7024cad2
authored
5 months ago
by
Thibaut ROMAIN
Browse files
Options
Downloads
Patches
Plain Diff
CI: simplify gdal bindings build and delete debug messages
parent
297867d8
No related branches found
Branches containing commit
No related tags found
1 merge request
!528
Support of ITK 5.x in OTB
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+7
-1
7 additions, 1 deletion
.gitlab-ci.yml
CMake/OTBModuleMacros.cmake
+0
-1
0 additions, 1 deletion
CMake/OTBModuleMacros.cmake
Modules/ThirdParty/ITK/CMakeLists.txt
+0
-1
0 additions, 1 deletion
Modules/ThirdParty/ITK/CMakeLists.txt
with
7 additions
and
3 deletions
.gitlab-ci.yml
+
7
−
1
View file @
7024cad2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
CMake/OTBModuleMacros.cmake
+
0
−
1
View file @
7024cad2
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Modules/ThirdParty/ITK/CMakeLists.txt
+
0
−
1
View file @
7024cad2
...
...
@@ -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
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment