From af49ab0f724cd511463e87d972b4055be9bbb922 Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Thu, 21 Feb 2019 16:01:58 +0100
Subject: [PATCH] FIX: Removed unneccessary parts of code in FindOpenBLAS.cmake
---
FindOpenBLAS.cmake | 70 +++++++++++++++++-----------------------------
1 file changed, 26 insertions(+), 44 deletions(-)
diff --git a/FindOpenBLAS.cmake b/FindOpenBLAS.cmake
index f35f61e7..57e5ad49 100644
--- a/FindOpenBLAS.cmake
+++ b/FindOpenBLAS.cmake
@@ -1,7 +1,5 @@
message("FindOpenBLAS starting...")
-set(OpenBLAS_ROOT external_dependencies/OpenBLAS)
-
FIND_PATH(
OpenBLAS_INCLUDE_DIR
@@ -20,55 +18,39 @@ FIND_PATH(
include/OpenBLAS
)
-#IF(${OpenBLAS_INCLUDE_DIR} MATCHES "^.*external_dependencies.*$")
-# # If OpenBLAS is downloaded locally, the library will be compiled during build-time
-# INCLUDE(FindPackageHandleStandardArgs)
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-# OpenBLAS
-# "OpenBLAS was NOT found!"
-# OpenBLAS_INCLUDE_DIR)
-#
-# if(OpenBLAS_FOUND)
-# message(STATUS "OpenBLAS is downloaded locally: ${OpenBLAS_INCLUDE_DIR}")
-# endif()
-#
-#else()
-
- FIND_LIBRARY(
- OpenBLAS_LIBRARIES
-
- NAMES
- ${LIB_PREFIX}openblas.${LIB_SUFFIX}
+FIND_LIBRARY(
+ OpenBLAS_LIBRARIES
- HINTS
- ${OpenBLAS_LIBRARY_DIRECTORY}
- $ENV{OpenBLAS_LIBRARY_DIRECTORY}
- ${ROOT_DIR}/external_dependencies/OpenBLAS
- /usr
+ NAMES
+ ${LIB_PREFIX}openblas.${LIB_SUFFIX}
- PATH_SUFFIXES
- lib
- lib/x86_64-linux-gnu
- local
- include/OpenBLAS/lib
- )
+ HINTS
+ ${OpenBLAS_LIBRARY_DIRECTORY}
+ $ENV{OpenBLAS_LIBRARY_DIRECTORY}
+ ${ROOT_DIR}/external_dependencies/OpenBLAS
+ /usr
- # Set OpenBLAS_Found
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(
- OpenBLAS
+ PATH_SUFFIXES
+ lib
+ lib/x86_64-linux-gnu
+ local
+ include/OpenBLAS/lib
+)
- FAIL_MESSAGE
- "OpenBLAS was NOT found!"
+# Set OpenBLAS_Found
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+ OpenBLAS
- REQUIRED_VARS
- OpenBLAS_INCLUDE_DIR
- OpenBLAS_LIBRARIES
- )
+ FAIL_MESSAGE
+ "OpenBLAS was NOT found!"
-#endif()
+ REQUIRED_VARS
+ OpenBLAS_INCLUDE_DIR
+ OpenBLAS_LIBRARIES
+)
-IF (OpenBLAS_LIBRARIES)
+IF (OpenBLAS_FOUND)
MESSAGE(STATUS "Found OpenBLAS libraries: ${OpenBLAS_LIBRARIES}")
MESSAGE(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")
ELSE()
--
GitLab