Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
225b82f9
Commit
225b82f9
authored
Jun 08, 2018
by
Antoine Regimbeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
REFAC: move OpenMp warning to shark module init file
parent
44c03adb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
CMake/FindShark.cmake
CMake/FindShark.cmake
+0
-7
Modules/ThirdParty/Shark/otb-module-init.cmake
Modules/ThirdParty/Shark/otb-module-init.cmake
+4
-2
No files found.
CMake/FindShark.cmake
View file @
225b82f9
...
...
@@ -125,13 +125,6 @@ else()
set
(
REQUIRED_CBLAS_LIB
)
endif
()
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
()
INCLUDE
(
${
CMAKE_ROOT
}
/Modules/FindPackageHandleStandardArgs.cmake
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
Shark
REQUIRED_VARS SHARK_LIBRARY SHARK_INCLUDE_DIR
${
REQUIRED_CBLAS_LIB
}
...
...
Modules/ThirdParty/Shark/otb-module-init.cmake
View file @
225b82f9
...
...
@@ -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
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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