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
Sébastien Peillet
otb
Commits
63f12e44
Commit
63f12e44
authored
8 years ago
by
Julien Michel
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-5.6' of
https://git.orfeo-toolbox.org/git/otb
into release-5.6
parents
7af4d202
f7f9631a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/Packaging/PMacros.cmake
+19
-10
19 additions, 10 deletions
SuperBuild/Packaging/PMacros.cmake
with
19 additions
and
10 deletions
SuperBuild/Packaging/PMacros.cmake
+
19
−
10
View file @
63f12e44
...
...
@@ -57,18 +57,27 @@ macro(macro_create_targets_for_package pkg)
COMMAND
${
CMAKE_COMMAND
}
--build
"."
--target install
WORKING_DIRECTORY
"
${
Monteverdi_BINARY_DIR
}
"
)
else
()
#Unxies Using SuperBuild
if
(
ENABLE_MONTEVERDI
)
else
()
#Using SuperBuild
#For out of source build,
#we assume the otb is built correctly with superbuild
if
(
OUT_OF_SOURCE_BUILD
)
add_custom_target
(
PACKAGE-
${
pkg
}
-check
COMMAND
${
CMAKE_COMMAND
}
-E echo
"Building PACKAGE-
${
pkg
}
-check"
DEPENDS MVD
)
COMMAND
${
CMAKE_COMMAND
}
-E echo
"Building PACKAGE-
${
pkg
}
-check"
)
else
(
OUT_OF_SOURCE_BUILD
)
if
(
ENABLE_MONTEVERDI
)
add_custom_target
(
PACKAGE-
${
pkg
}
-check
COMMAND
${
CMAKE_COMMAND
}
-E echo
"Building PACKAGE-
${
pkg
}
-check"
DEPENDS MVD
WORKING_DIRECTORY
${
SUPERBUILD_BINARY_DIR
}
)
else
(
ENABLE_MONTEVERDI
)
add_custom_target
(
PACKAGE-
${
pkg
}
-check
COMMAND
${
CMAKE_COMMAND
}
-E echo
"Building PACKAGE-
${
pkg
}
-check"
DEPENDS OTB
)
endif
(
ENABLE_MONTEVERDI
)
add_custom_target
(
PACKAGE-
${
pkg
}
-check
COMMAND
${
CMAKE_COMMAND
}
-E echo
"Building PACKAGE-
${
pkg
}
-check"
DEPENDS OTB
WORKING_DIRECTORY
${
SUPERBUILD_BINARY_DIR
}
)
endif
(
ENABLE_MONTEVERDI
)
endif
(
OUT_OF_SOURCE_BUILD
)
endif
()
add_dependencies
(
PACKAGE-
${
pkg
}
-check PACKAGE-TOOLS
)
...
...
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