Skip to content

Commit 2edf1c5

Browse files
committed
fix static parallel linux?
1 parent 460e56b commit 2edf1c5

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

cmake/FindBLAS.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
565565
"${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")
566566
endforeach()
567567
endforeach()
568-
else ()
568+
else () # else not Windows
569569
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
570570
list(APPEND BLAS_SEARCH_LIBS
571571
"mkl_blas95 mkl_intel mkl_intel_thread mkl_core guide")
@@ -576,10 +576,10 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
576576
"mkl_blas95 mkl_intel_lp64 mkl_intel_thread mkl_core guide")
577577

578578
# mkl >= 10.3
579-
if (CMAKE_C_COMPILER MATCHES ".+gcc")
579+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
580580
list(APPEND BLAS_SEARCH_LIBS
581-
"mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core iomp5")
582-
# "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
581+
# "mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core iomp5")
582+
"mkl_blas95_lp64 mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
583583
else ()
584584
list(APPEND BLAS_SEARCH_LIBS
585585
"mkl_blas95_lp64 mkl_intel_lp64 mkl_intel_thread mkl_core iomp5")
@@ -645,10 +645,9 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
645645
"mkl_intel_lp64 mkl_intel_thread mkl_core guide")
646646

647647
# mkl >= 10.3
648-
if (CMAKE_C_COMPILER MATCHES ".+gcc")
648+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
649649
list(APPEND BLAS_SEARCH_LIBS
650-
# "mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
651-
"mkl_intel_lp64 mkl_intel_thread mkl_core iomp5")
650+
"mkl_intel_lp64 mkl_gnu_thread mkl_core gomp")
652651
else ()
653652
list(APPEND BLAS_SEARCH_LIBS
654653
"mkl_intel_lp64 mkl_intel_thread mkl_core iomp5")

0 commit comments

Comments
 (0)