Merged in proffan/gtsam (pull request #392)

Fix compilation on MKL 2019 Approved-by: Chris Beall <chrisbeall@gmail.com>
2019-03-17 22:45:25 +00:00 · 2019-03-17 22:45:25 +00:00 · 4b723107b3
parent bb85f26127 0d924e23db
commit 4b723107b3
1 changed files with 9 additions and 0 deletions
--- a/cmake/FindMKL.cmake
+++ b/cmake/FindMKL.cmake
@ -206,6 +206,15 @@ ELSEIF(MKL_ROOT_DIR) # UNIX and macOS
                )
        ENDIF()

+        IF(NOT MKL_LAPACK_LIBRARY)
+                FIND_LIBRARY(MKL_LAPACK_LIBRARY
+                  mkl_intel_lp64
+                  PATHS
+                        ${MKL_ROOT_DIR}/lib/${MKL_ARCH_DIR}
+                        ${MKL_ROOT_DIR}/lib/
+                )
+        ENDIF()
+
        # iomp5
        IF("${MKL_ARCH_DIR}" STREQUAL "32")
                IF(UNIX AND NOT APPLE)