Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bas Couwenberg
otb
Commits
7b360b86
Commit
7b360b86
authored
Jun 08, 2018
by
Antoine Regimbeau
Browse files
Merge branch 'shark_openmp' into 'release-6.6'
Shark and OpenMP See merge request
orfeotoolbox/otb!134
parents
6b3198ce
225b82f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/ThirdParty/Shark/otb-module-init.cmake
View file @
7b360b86
...
...
@@ -20,8 +20,10 @@
find_package
(
Shark REQUIRED
)
if
(
SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP
)
message
(
WARNING
"Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF."
)
if
(
SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP
)
message
(
WARNING
"Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.\
It will be turned to ON to allow compilation."
)
set
(
OTB_USE_OPENMP
"ON"
CACHE BOOL
"Add openmp compiler and linker flags"
FORCE
)
endif
()
mark_as_advanced
(
Shark_DIR
)
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment