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
28fed47f
Commit
28fed47f
authored
7 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
COMP: allow GeoTIFF and TIFF to be disabled when no 3rd party drags them
parent
e372b4a4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/OTBModuleEnablement.cmake
+12
-8
12 additions, 8 deletions
CMake/OTBModuleEnablement.cmake
Modules/ThirdParty/GeoTIFF/otb-module.cmake
+2
-0
2 additions, 0 deletions
Modules/ThirdParty/GeoTIFF/otb-module.cmake
with
14 additions
and
8 deletions
CMake/OTBModuleEnablement.cmake
+
12
−
8
View file @
28fed47f
...
...
@@ -157,14 +157,18 @@ macro(otb_module_enable otb-module _needed_by)
endif
()
if
(
NOT
${
otb-module
}
_ENABLED
)
set
(
${
otb-module
}
_ENABLED 1
)
foreach
(
dep IN LISTS OTB_MODULE_
${
otb-module
}
_DEPENDS
)
otb_module_enable
(
${
dep
}
${
otb-module
}
)
endforeach
()
foreach
(
dep IN LISTS OTB_MODULE_
${
otb-module
}
_OPTIONAL_DEPENDS
)
otb_module_enable
(
${
dep
}
${
otb-module
}
)
endforeach
()
if
(
${
otb-module
}
_TESTED_BY
AND
(
OTB_BUILD_DEFAULT_MODULES OR OTB_BUILD_ALL_MODULES_FOR_TESTS OR Module_
${
otb-module
}
))
otb_module_enable
(
${${
otb-module
}
_TESTED_BY
}
""
)
# if this module has an ACTIVATION_OPTION=OFF, don't bother enable its dependencies
if
(
NOT
(
OTB_MODULE_
${
otb-module
}
_ACTIVATION_OPTION
AND NOT
${
OTB_MODULE_
${
otb-module
}
_ACTIVATION_OPTION
}
))
foreach
(
dep IN LISTS OTB_MODULE_
${
otb-module
}
_DEPENDS
)
otb_module_enable
(
${
dep
}
${
otb-module
}
)
endforeach
()
foreach
(
dep IN LISTS OTB_MODULE_
${
otb-module
}
_OPTIONAL_DEPENDS
)
otb_module_enable
(
${
dep
}
${
otb-module
}
)
endforeach
()
if
(
${
otb-module
}
_TESTED_BY
AND
(
OTB_BUILD_DEFAULT_MODULES OR OTB_BUILD_ALL_MODULES_FOR_TESTS OR Module_
${
otb-module
}
))
otb_module_enable
(
${${
otb-module
}
_TESTED_BY
}
""
)
endif
()
endif
()
endif
()
endmacro
()
...
...
This diff is collapsed.
Click to expand it.
Modules/ThirdParty/GeoTIFF/otb-module.cmake
+
2
−
0
View file @
28fed47f
...
...
@@ -27,4 +27,6 @@ otb_module(OTBGeoTIFF
DESCRIPTION
"
${
DOCUMENTATION
}
"
EXCLUDE_FROM_DEFAULT
)
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