merged

dlib/CMakeLists.txt

@@ -512,7 +512,7 @@ if (NOT TARGET dlib)
 
       if (DLIB_USE_BLAS OR DLIB_USE_LAPACK OR DLIB_USE_MKL_FFT)
          # Try to find BLAS, LAPACK and MKL
-         include(cmake_utils/cmake_find_blas.txt)
+         include(cmake_utils/find_blas.cmake)
 
          if (DLIB_USE_BLAS)
             if (blas_found)
@@ -596,7 +596,8 @@ if (NOT TARGET dlib)
                # make sure cuda is really working by doing a test compile
                message(STATUS "Building a CUDA test project to see if your compiler is compatible with CUDA...")
 
-               set(CUDA_TEST_CMAKE_FLAGS "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+               set(CUDA_TEST_CMAKE_FLAGS 
+                  "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
                   "-DCMAKE_INCLUDE_PATH=${CMAKE_INCLUDE_PATH}"
                   "-DCMAKE_LIBRARY_PATH=${CMAKE_LIBRARY_PATH}")
 
@@ -604,7 +605,8 @@ if (NOT TARGET dlib)
                   list(APPEND CUDA_TEST_CMAKE_FLAGS "-DCUDA_HOST_COMPILER=${CUDA_HOST_COMPILER}")
                endif()
 
-               try_compile(cuda_test_compile_worked ${PROJECT_BINARY_DIR}/cuda_test_build 
+               try_compile(cuda_test_compile_worked 
+                  ${PROJECT_BINARY_DIR}/cuda_test_build 
                   ${PROJECT_SOURCE_DIR}/cmake_utils/test_for_cuda cuda_test
                   CMAKE_FLAGS ${CUDA_TEST_CMAKE_FLAGS}
                   OUTPUT_VARIABLE try_compile_output_message
@@ -618,7 +620,8 @@ if (NOT TARGET dlib)
                   message(STATUS "*****************************************************************************************************************")
                else()
                   message(STATUS "Checking if you have the right version of cuDNN installed.")
-                  try_compile(cudnn_test_compile_worked ${PROJECT_BINARY_DIR}/cudnn_test_build 
+                  try_compile(cudnn_test_compile_worked 
+                     ${PROJECT_BINARY_DIR}/cudnn_test_build 
                      ${PROJECT_SOURCE_DIR}/cmake_utils/test_for_cudnn cudnn_test
                      CMAKE_FLAGS ${CUDA_TEST_CMAKE_FLAGS}
                      )