3 @@ -47,7 +47,7 @@ function(findLib libName libDir libOut)
4 find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib
5 PATHS ${${libDir}} NO_DEFAULT_PATH)
7 - find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a
8 + find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@
9 PATHS ${${libDir}} NO_DEFAULT_PATH)
12 diff --git a/FindDependencies.cmake b/FindDependencies.cmake
13 index 2d644005f..7261ba923 100644
14 --- a/FindDependencies.cmake
15 +++ b/FindDependencies.cmake
16 @@ -46,8 +46,8 @@ if(MKLROOT)
19 find_library(MKL_OMP_LIB
20 - NAMES iomp5 iomp5md libiomp5md.lib
21 - PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
22 + NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib
23 + PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib
24 PATH_SUFFIXES "intel64" "intel32"
26 DOC "MKL OMP Library")