Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dlib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
dlib
Commits
a966aeb9
Commit
a966aeb9
authored
Dec 18, 2017
by
Davis King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed problem with openmp linking
parent
a5121e57
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
dlib/CMakeLists.txt
+1
-1
cmake_find_blas.txt
dlib/cmake_utils/cmake_find_blas.txt
+3
-3
No files found.
dlib/CMakeLists.txt
View file @
a966aeb9
...
@@ -638,7 +638,7 @@ if (NOT TARGET dlib)
...
@@ -638,7 +638,7 @@ if (NOT TARGET dlib)
${
CUDA_curand_LIBRARY
}
${
CUDA_curand_LIBRARY
}
${
cusolver
}
${
cusolver
}
)
)
if
(
OPENMP_FOUND
)
if
(
openmp_libraries
)
list
(
APPEND dlib_needed_libraries
${
openmp_libraries
}
)
list
(
APPEND dlib_needed_libraries
${
openmp_libraries
}
)
endif
()
endif
()
...
...
dlib/cmake_utils/cmake_find_blas.txt
View file @
a966aeb9
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
# lapack_libraries - link against these to use LAPACK library
# lapack_libraries - link against these to use LAPACK library
# mkl_libraries - link against these to use the MKL library
# mkl_libraries - link against these to use the MKL library
# mkl_include_dir - add to the include path to use the MKL library
# mkl_include_dir - add to the include path to use the MKL library
# openmp_lib
arir
es - Set to Intel's OpenMP library if and only if we
# openmp_lib
rari
es - Set to Intel's OpenMP library if and only if we
# find the MKL.
# find the MKL.
# setting this makes CMake allow normal looking if else statements
# setting this makes CMake allow normal looking if else statements
...
@@ -101,8 +101,8 @@ if (UNIX OR MINGW)
...
@@ -101,8 +101,8 @@ if (UNIX OR MINGW)
# Search for the needed libraries from the MKL. We will try to link against the mkl_rt
# Search for the needed libraries from the MKL. We will try to link against the mkl_rt
# file first since this way avoids linking bugs in some cases.
# file first since this way avoids linking bugs in some cases.
find_library(mkl_rt mkl_rt ${mkl_search_path})
find_library(mkl_rt mkl_rt ${mkl_search_path})
find_library(openmp_lib
arir
es iomp5 ${mkl_search_path})
find_library(openmp_lib
rari
es iomp5 ${mkl_search_path})
mark_as_advanced( mkl_rt openmp_lib
arir
es )
mark_as_advanced( mkl_rt openmp_lib
rari
es )
# if we found the MKL
# if we found the MKL
if ( mkl_rt)
if ( mkl_rt)
set(mkl_libraries ${mkl_rt} )
set(mkl_libraries ${mkl_rt} )
...
...
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