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
Gaëlle USSEGLIO
otb
Commits
8cab8279
Commit
8cab8279
authored
8 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix c++11 requirement, check must be done after enablement/disablement routines
parent
afa830a4
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
CMake/OTBModuleEnablement.cmake
+5
-0
5 additions, 0 deletions
CMake/OTBModuleEnablement.cmake
CMake/OTBModuleMacros.cmake
+1
-3
1 addition, 3 deletions
CMake/OTBModuleMacros.cmake
with
6 additions
and
3 deletions
CMake/OTBModuleEnablement.cmake
+
5
−
0
View file @
8cab8279
...
...
@@ -169,6 +169,11 @@ set(OTB_MODULES_ENABLED "")
set
(
OTB_MODULES_DISABLED
""
)
foreach
(
otb-module
${
OTB_MODULES_ALL
}
)
if
(
${
otb-module
}
_ENABLED
)
# check cxx11 requirement after all enable/disable macros have been passed
if
(
OTB_MODULE_
${
otb-module
}
_REQUIRES_CXX11 AND NOT OTB_HAS_CXX11
)
message
(
FATAL_ERROR
"Module
${
otb-module
}
requires C++11 support. Consider adding --std=c++11 to your compiler flags or disabling it."
)
endif
()
list
(
APPEND OTB_MODULES_ENABLED
${
otb-module
}
)
# We will sort modules according to their dependency graph,
...
...
This diff is collapsed.
Click to expand it.
CMake/OTBModuleMacros.cmake
+
1
−
3
View file @
8cab8279
...
...
@@ -336,7 +336,5 @@ macro(otb_module_target _name)
endmacro
()
macro
(
otb_module_requires_cxx11
)
if
(
${
otb-module
}
_ENABLED AND NOT
${
OTB_HAS_CXX11
}
)
message
(
FATAL_ERROR
"Module
${
otb-module
}
requires C++11 support. Consider adding --std=c++11 to your compiler flags or disabling it."
)
endif
()
set
(
OTB_MODULE_
${
otb-module
}
_REQUIRES_CXX11 1
)
endmacro
()
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