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
3b67a2d0
Commit
3b67a2d0
authored
6 years ago
by
Cédric Traizet
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-6.6' of
https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb
into release-6.6
parents
87c1b789
cd43bce1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Modules/Remote/otbFFSforGMM.remote.cmake
+1
-1
1 addition, 1 deletion
Modules/Remote/otbFFSforGMM.remote.cmake
SuperBuild/CMake/External_shark.cmake
+2
-2
2 additions, 2 deletions
SuperBuild/CMake/External_shark.cmake
with
3 additions
and
3 deletions
Modules/Remote/otbFFSforGMM.remote.cmake
+
1
−
1
View file @
3b67a2d0
...
...
@@ -25,5 +25,5 @@ A more detailed description can be found on the project website:
https://github.com/Laadr/otbFFSforGMM
"
GIT_REPOSITORY https://github.com/Laadr/otbFFSforGMM.git
GIT_TAG
3ad529b9c5c81b7dd17fe83d4802ad5a3c4eb62b
GIT_TAG
d9c31cf51b59a4a10e4daa2858a85cd12561c696
)
This diff is collapsed.
Click to expand it.
SuperBuild/CMake/External_shark.cmake
+
2
−
2
View file @
3b67a2d0
...
...
@@ -30,8 +30,8 @@ ADD_SUPERBUILD_CMAKE_VAR(SHARK BOOST_LIBRARYDIR)
ExternalProject_Add
(
SHARK
PREFIX SHARK
URL
"https://github.com/Shark-ML/Shark/archive/
2fd55e2b83f0666d05b403b291712668f4b76a13
.zip"
URL_MD5
863bb5f0d94b01be5292867beb05a0bb
URL
"https://github.com/Shark-ML/Shark/archive/
67990bcd2c4a90a27be97d933b3740931e9da141
.zip"
URL_MD5
9ad7480a4f9832b63086b9a683566187
SOURCE_DIR
${
SHARK_SB_SRC
}
BINARY_DIR
${
SHARK_SB_BUILD_DIR
}
INSTALL_DIR
${
SB_INSTALL_PREFIX
}
...
...
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