From c4372d10bcdb68a08cdfe8ad5a96848708d9a35c Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Fri, 22 Jun 2018 19:40:37 +0100 Subject: [PATCH] Better way of finding OpenBLAS --- CMakeLists.txt | 1 - cmake/modules/FindOpenBLAS.cmake | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b22d6032..89f7be75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,6 @@ find_package(dlib 19.13) if(${dlib_FOUND}) message("dlib information:") message(" dlib version: ${dlib_VERSION}") - message(" dlib_INCLUDE_DIRS: ${dlib_INCLUDE_DIRS}") if (NOT TARGET dlib) add_library(dlib INTERFACE IMPORTED GLOBAL) diff --git a/cmake/modules/FindOpenBLAS.cmake b/cmake/modules/FindOpenBLAS.cmake index f95c507d..bd34c4cc 100644 --- a/cmake/modules/FindOpenBLAS.cmake +++ b/cmake/modules/FindOpenBLAS.cmake @@ -75,26 +75,18 @@ SET(Open_BLAS_LIB_SEARCH_PATHS /usr/local/opt/openblas/lib ) -FIND_PATH(OpenBLAS_INCLUDE_DIR NAMES cblas.h PATHS ${Open_BLAS_INCLUDE_SEARCH_PATHS} NO_DEFAULT_PATH) -FIND_PATH(OpenBLAS_INCLUDE_DIR_F NAMES f77blas.h PATHS ${Open_BLAS_INCLUDE_SEARCH_PATHS} NO_DEFAULT_PATH) +FIND_PATH(OpenBLAS_INCLUDE_DIR NAMES openblas_config.h PATHS ${Open_BLAS_INCLUDE_SEARCH_PATHS} NO_DEFAULT_PATH) FIND_LIBRARY(OpenBLAS_LIB NAMES openblas PATHS ${Open_BLAS_LIB_SEARCH_PATHS} NO_DEFAULT_PATH) SET(OpenBLAS_FOUND ON) -# Check include files +# Check include files IF(NOT OpenBLAS_INCLUDE_DIR) SET(OpenBLAS_FOUND OFF) MESSAGE(STATUS "Could not find OpenBLAS include. Turning OpenBLAS_FOUND off") ENDIF() -# Check include files -IF(NOT OpenBLAS_INCLUDE_DIR_F) - MESSAGE(STATUS "Could not find f77blas include.") -ELSE(NOT OpenBLAS_INCLUDE_DIR_F) - MESSAGE(STATUS "Found f77blas include: ${OpenBLAS_INCLUDE_DIR_F}") -ENDIF() - -# Check libraries +# Check libraries IF(NOT OpenBLAS_LIB) SET(OpenBLAS_FOUND OFF) MESSAGE(STATUS "Could not find OpenBLAS lib. Turning OpenBLAS_FOUND off")