Skip to content

Commit a0a57b5

Browse files
committed
cmake find blas
1 parent 7f5ae41 commit a0a57b5

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/julia/build_tarballs.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
3434
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
3535
-DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
3636
-DHIPO=ON \
37-
-DBLA_VENDOR=OpenBLAS \
38-
-DCMAKE_PREFIX_PATH=${prefix} \
37+
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
3938
-DMETIS_ROOT=${prefix} \
4039
..
4140

cmake/FindHipoDeps.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
set(BLAS_ROOT "" CACHE STRING "Root directory of BLAS or OpenBLAS")
33
message(STATUS "BLAS_ROOT is " ${BLAS_ROOT})
44

5-
set(BLA_VENDOR "" CACHE STRING "For blas trampoline")
5+
set(USE_CMAKE_FIND_BLAS ON)
6+
7+
# if ((NOT BLAS_LIBRARIES STREQUAL "") OR
8+
# (NOT BLA_VENDOR STREQUAL ""))
9+
# set(USE_CMAKE_FIND_BLAS ON)
10+
# endif()
611

712
# Optionally set the vendor:
813
# set(BLA_VENDOR libblastrampoline)
914

10-
if (BLA_VENDOR STREQUAL "")
15+
if (NOT USE_CMAKE_FIND_BLAS)
1116
if (WIN32)
1217
if (NOT (BLAS_ROOT STREQUAL ""))
1318
message(STATUS "Looking for blas in " ${BLAS_ROOT})
@@ -98,7 +103,6 @@ if (BLA_VENDOR STREQUAL "")
98103
endif()
99104
endif()
100105
else()
101-
# if (NOT BLA_VENDOR STREQUALS "")
102106
find_package(BLAS REQUIRED)
103107
if (BLAS_FOUND)
104108
message(STATUS "Using BLAS library: ${BLAS_LIBRARIES}")

0 commit comments

Comments
 (0)