Commit a966aeb9 authored by Davis King's avatar Davis King

Fixed problem with openmp linking

parent a5121e57
...@@ -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()
......
...@@ -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_libarires - Set to Intel's OpenMP library if and only if we # openmp_libraries - 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_libarires iomp5 ${mkl_search_path}) find_library(openmp_libraries iomp5 ${mkl_search_path})
mark_as_advanced( mkl_rt openmp_libarires ) mark_as_advanced( mkl_rt openmp_libraries )
# 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} )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment