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
225b82f9
Commit
225b82f9
authored
6 years ago
by
Antoine Regimbeau
Browse files
Options
Downloads
Patches
Plain Diff
REFAC: move OpenMp warning to shark module init file
parent
44c03adb
Branches
shark_openmp
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/FindShark.cmake
+0
-7
0 additions, 7 deletions
CMake/FindShark.cmake
Modules/ThirdParty/Shark/otb-module-init.cmake
+4
-2
4 additions, 2 deletions
Modules/ThirdParty/Shark/otb-module-init.cmake
with
4 additions
and
9 deletions
CMake/FindShark.cmake
+
0
−
7
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
}
...
...
This diff is collapsed.
Click to expand it.
Modules/ThirdParty/Shark/otb-module-init.cmake
+
4
−
2
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
)
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