make sure DLIB_USE_BLAS and DLIB_USE_LAPACK are enabled by default when MKL is enabled.

Author: me

dlib/CMakeLists.txt

@@ -610,21 +610,30 @@ if (NOT TARGET dlib)
             enable_preprocessor_switch(DLIB_USE_MKL_THREAD)
             list (APPEND dlib_needed_public_libraries ${mkl_libraries_thread})
          endif()
-      else()
-         if(DLIB_USE_BLAS)
+      endif()
+
+      if(DLIB_USE_BLAS)
+         enable_preprocessor_switch(DLIB_USE_BLAS)
+         if (NOT DLIB_USE_MKL_SEQUENTIAL AND NOT DLIB_USE_MKL_WITH_TBB AND NOT DLIB_USE_MKL_THREAD)
             message(STATUS "Using BLAS ${blas_libraries}")
-            enable_preprocessor_switch(DLIB_USE_BLAS)
             list (APPEND dlib_needed_public_libraries ${blas_libraries})
+         else()
+            message(STATUS "Using MKL BLAS")
          endif()
-         if(DLIB_USE_LAPACK)
+      endif()
+
+      if(DLIB_USE_LAPACK)
+         enable_preprocessor_switch(DLIB_USE_LAPACK)
+         if (NOT DLIB_USE_MKL_SEQUENTIAL AND NOT DLIB_USE_MKL_WITH_TBB AND NOT DLIB_USE_MKL_THREAD)
             message(STATUS "Using LAPACK ${lapack_libraries}")
-            enable_preprocessor_switch(DLIB_USE_LAPACK)
             list (APPEND dlib_needed_public_libraries ${lapack_libraries})
             if (lapack_with_underscore)
                enable_preprocessor_switch(LAPACK_FORCE_UNDERSCORE)
             elseif (lapack_without_underscore)
                enable_preprocessor_switch(LAPACK_FORCE_NOUNDERSCORE)
             endif ()
+         else()
+            message(STATUS "Using MKL LAPACK")
          endif()
       endif()
 

dlib/cmake_utils/find_blas.cmake

@@ -184,6 +184,7 @@ endif()
 
 if (mkl_seq_found OR mkl_tbb_found OR mkl_thread_found)
    set(mkl_found 1)
+   return()
 endif()
 
 # Search for BLAS - pkgconfig