Skip to content
Snippets Groups Projects
Commit 51ff8ea7 authored by Martin Beseda's avatar Martin Beseda
Browse files

FIX: trying to fix CI...

parent a53b729c
No related branches found
No related tags found
No related merge requests found
...@@ -93,8 +93,8 @@ endif() ...@@ -93,8 +93,8 @@ endif()
set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}) set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
set(SRC_DIR ${ROOT_DIR}/src) set(SRC_DIR ${ROOT_DIR}/src)
set(PROJECT_BINARY_DIR ${ROOT_DIR}/build) set(PROJECT_BINARY_DIR ${ROOT_DIR}/build)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
#----------------------------------------# #----------------------------------------#
...@@ -188,18 +188,20 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD) ...@@ -188,18 +188,20 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
include(DownloadArmadillo) include(DownloadArmadillo)
endif() endif()
#------------------------------------------------------# #-------------------------------------------------------#
# Look for linear algebra libraries neede by Armadillo # # Look for linear algebra libraries needed by Armadillo #
#------------------------------------------------------# #-------------------------------------------------------#
set(OpenBLAS_LIBRARIES "") set(OpenBLAS_LIBRARIES "")
find_package(OpenBLAS) find_package(OpenBLAS)
option(OpenBLAS_LOCAL OFF) option(OpenBLAS_LOCAL OFF)
if(NOT OpenBLAS_FOUND) if(NOT OpenBLAS_FOUND)
if(ALLOW_OpenBLAS_DOWNLOAD) if(ALLOW_OpenBLAS_DOWNLOAD)
include(DownloadOpenBLAS) include(DownloadOpenBLAS)
set(OpenBLAS_LOCAL ON) set(OpenBLAS_LOCAL ON)
set(OpenBLAS_LIBRARIES ${OpenBLAS_LOCAL_PATH}) set(OpenBLAS_LIBRARIES "${ROOT_DIR}/external_dependencies/OpenBLAS/lib/${LIB_PREFIX}openblas.${LIB_SUFFIX}")
message("OpenBLAS_LIBRARIES ${OpenBLAS_LIBRARIES}") message("OpenBLAS_LIBRARIES ${OpenBLAS_LIBRARIES}")
else() else()
find_package(BLAS) find_package(BLAS)
...@@ -208,6 +210,7 @@ if(NOT OpenBLAS_FOUND) ...@@ -208,6 +210,7 @@ if(NOT OpenBLAS_FOUND)
if(NOT BLAS_FOUND AND NOT LAPACK_FOUND) if(NOT BLAS_FOUND AND NOT LAPACK_FOUND)
message(FATAL_ERROR "No BLAS or LAPACK libraries are available!") message(FATAL_ERROR "No BLAS or LAPACK libraries are available!")
endif() endif()
endif() endif()
endif() endif()
......
...@@ -13,7 +13,8 @@ FetchContent_Declare( ...@@ -13,7 +13,8 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git GIT_REPOSITORY https://github.com/xianyi/OpenBLAS.git
) )
#set(FETCHCONTENT_QUIET FALSE) # See messages during 'git clone'
set(FETCHCONTENT_QUIET FALSE)
if(NOT OpenBLAS_POPULATED) if(NOT OpenBLAS_POPULATED)
FetchContent_Populate(OpenBLAS) FetchContent_Populate(OpenBLAS)
......
...@@ -107,7 +107,7 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -107,7 +107,7 @@ if ("${BUILD_LIB}" STREQUAL "yes")
PRE_BUILD PRE_BUILD
COMMAND cmake . COMMAND cmake .
COMMAND cmake --build . -j ${N_CORES} COMMAND cmake --build . -j ${N_CORES}
WORKING_DIRECTORY ${OpenBLAS_LOCAL_PATH} WORKING_DIRECTORY ${ROOT_DIR}/external_dependencies/OpenBLAS
COMMENT "Compiling OpenBLAS" COMMENT "Compiling OpenBLAS"
) )
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment