fix blas build

Author: pfeatherstone

dlib/CMakeLists.txt

@@ -186,8 +186,6 @@ if (NOT TARGET dlib)
    set (DLIB_LINK_WITH_SQLITE3_STR
       "Disable this if you don't want to link against sqlite3" )
    #set (DLIB_USE_FFTW_STR "Disable this if you don't want to link against fftw" )
-   set (DLIB_USE_MKL_FFT_STR
-      "Disable this is you don't want to use the MKL DFTI FFT implementation" )
    set (DLIB_ENABLE_ASSERTS_STR
       "Enable this if you want to turn on the DLIB_ASSERT macro" )
    set (DLIB_USE_FFMPEG_STR
@@ -253,7 +251,6 @@ if (NOT TARGET dlib)
       #option(DLIB_USE_FFTW ${DLIB_USE_FFTW_STR} ON)
       option(DLIB_USE_FFMPEG ${DLIB_USE_FFMPEG_STR} ON)
    endif()
-   cmake_dependent_option(DLIB_USE_MKL_FFT         ${DLIB_USE_MKL_FFT_STR}          ON "mkl_found"          OFF)
    cmake_dependent_option(DLIB_USE_MKL_SEQUENTIAL  ${DLIB_USE_MKL_SEQUENTIAL_STR}   ON "mkl_seq_found"      OFF)
    cmake_dependent_option(DLIB_USE_MKL_WITH_TBB    ${DLIB_USE_MKL_WITH_TBB_STR}     ON "mkl_tbb_found"      OFF)
    cmake_dependent_option(DLIB_USE_MKL_THREAD      ${DLIB_USE_MKL_THREAD_STR}       ON "mkl_thread_found"   OFF)
@@ -268,7 +265,6 @@ if (NOT TARGET dlib)
    toggle_preprocessor_switch(DLIB_WEBP_SUPPORT)
    toggle_preprocessor_switch(DLIB_JXL_SUPPORT) 
    #toggle_preprocessor_switch(DLIB_USE_FFTW)
-   toggle_preprocessor_switch(DLIB_USE_MKL_FFT)
    toggle_preprocessor_switch(DLIB_USE_MKL_SEQUENTIAL)
    toggle_preprocessor_switch(DLIB_USE_MKL_WITH_TBB)
    toggle_preprocessor_switch(DLIB_USE_MKL_THREAD)
@@ -621,17 +617,22 @@ if (NOT TARGET dlib)
             disable_preprocessor_switch(DLIB_USE_MKL_WITH_TBB)
             list (APPEND dlib_needed_public_libraries ${mkl_libraries_thread})
          endif()
-      elseif(DLIB_USE_BLAS)
-         list (APPEND dlib_needed_public_libraries ${blas_libraries})
-      elseif(DLIB_USE_LAPACK)
-         list (APPEND dlib_needed_public_libraries ${lapack_libraries})
-         if (lapack_with_underscore)
-            set(LAPACK_FORCE_UNDERSCORE 1)
-            enable_preprocessor_switch(LAPACK_FORCE_UNDERSCORE)
-         elseif (lapack_without_underscore)
-            set(LAPACK_FORCE_NOUNDERSCORE 1)
-            enable_preprocessor_switch(LAPACK_FORCE_NOUNDERSCORE)
-         endif ()
+      else()
+         if(DLIB_USE_BLAS)
+            message(STATUS "Using BLAS ${blas_libraries}")
+            list (APPEND dlib_needed_public_libraries ${blas_libraries})
+         endif()
+         if(DLIB_USE_LAPACK)
+            message(STATUS "Using LAPACK ${lapack_libraries}")
+            list (APPEND dlib_needed_public_libraries ${lapack_libraries})
+            if (lapack_with_underscore)
+               set(LAPACK_FORCE_UNDERSCORE 1)
+               enable_preprocessor_switch(LAPACK_FORCE_UNDERSCORE)
+            elseif (lapack_without_underscore)
+               set(LAPACK_FORCE_NOUNDERSCORE 1)
+               enable_preprocessor_switch(LAPACK_FORCE_NOUNDERSCORE)
+            endif ()
+         endif()
       endif()
 
       if (DLIB_USE_CUDA)

dlib/cmake_utils/find_blas.cmake

@@ -12,7 +12,7 @@
 #  mkl_tbb_found              - True if the Intel MKL tbb library is available
 #  mkl_thread_found           - True if the Intel MKL thread library is available
 #  mkl_found                  - True if at least one of (mkl_seq_found,mkl_tbb_found,mkl_thread_found) is true
-#  mkl_include_dir            - add to the include path to use the MKL library
+#  mkl_include_dir            - MKL include directory
 #  mkl_libraries_sequential   - MKL sequential libraries if found
 #  mkl_libraries_tbb          - MKL tbb libraries if found
 #  mkl_libraries_thread       - MKL thread libraries if found