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
52f6c942
Commit
52f6c942
authored
7 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
COMP: cleanup find_shark (openmp controlled globally)
parent
256f237f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/FindShark.cmake
+0
-17
0 additions, 17 deletions
CMake/FindShark.cmake
with
0 additions
and
17 deletions
CMake/FindShark.cmake
+
0
−
17
View file @
52f6c942
...
...
@@ -110,27 +110,10 @@ string(REGEX MATCH
set
(
SHARK_USE_OPENMP FALSE CACHE BOOL
"shark is built with OpenMP"
)
if
(
SHARK_USE_OPENMP_matched
)
set
(
SHARK_USE_OPENMP TRUE CACHE BOOL
"shark is built with OpenMP"
FORCE
)
endif
()
#This is quick fix/hack/commit that will get back all failing tests on
# The good fix must to fix all those failing tests. They are crashing
# due to openmp issues which only popup with this fix
if
(
NOT WIN32
)
if
(
SHARK_USE_OPENMP
)
message
(
STATUS
"Shark is built with OpenMP: SHARK_USE_OPENMP = TRUE"
)
find_package
(
OpenMP REQUIRED QUIET
)
if
(
OPENMP_FOUND
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
OpenMP_C_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
OpenMP_CXX_FLAGS
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
${
OpenMP_EXE_LINKER_FLAGS
}
"
)
else
()
message
(
FATAL_ERROR
"Your shark libraries are compiled with it OpenMP"
)
set
(
SHARK_FOUND FALSE
)
endif
()
else
()
message
(
STATUS
"Shark is built without OpenMP: SHARK_USE_OPENMP = FALSE"
)
endif
()
endif
(
NOT WIN32
)
INCLUDE
(
${
CMAKE_ROOT
}
/Modules/FindPackageHandleStandardArgs.cmake
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
Shark
...
...
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