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

FIX: Trying to fix CI...

parent 93347264
No related branches found
No related tags found
No related merge requests found
...@@ -155,8 +155,8 @@ endif() ...@@ -155,8 +155,8 @@ endif()
if(NOT WIN32) if(NOT WIN32)
message("Checking Armadillo dependencies") message("Checking Armadillo dependencies")
find_package(LAPACK) # find_package(LAPACK)
find_package(BLAS) # find_package(BLAS)
set(ARMA_LIBS "") set(ARMA_LIBS "")
if(NOT LAPACK_FOUND AND NOT BLAS_FOUND) if(NOT LAPACK_FOUND AND NOT BLAS_FOUND)
......
...@@ -42,6 +42,9 @@ if(NOT rv STREQUAL "0") ...@@ -42,6 +42,9 @@ if(NOT rv STREQUAL "0")
message("OpenBLAS build: cmake --build: ${rv}") message("OpenBLAS build: cmake --build: ${rv}")
endif() endif()
set_target_properties(openblas PROPERTIES LINK_FLAGS)
add_subdirectory(${OPENBLAS_LOCAL_PATH})
find_package(OpenBLAS) find_package(OpenBLAS)
if(NOT OpenBLAS_FOUND) if(NOT OpenBLAS_FOUND)
......
...@@ -69,6 +69,15 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -69,6 +69,15 @@ if ("${BUILD_LIB}" STREQUAL "yes")
set(CXX_FILESYSTEM_LIB "stdc++fs") set(CXX_FILESYSTEM_LIB "stdc++fs")
endif () endif ()
# Detect Threading library
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
set(GFORT "")
if(NOT WIN32)
set(GFORT gfortran)
endif()
target_link_libraries( target_link_libraries(
lib4neuro lib4neuro
...@@ -77,6 +86,8 @@ if ("${BUILD_LIB}" STREQUAL "yes") ...@@ -77,6 +86,8 @@ if ("${BUILD_LIB}" STREQUAL "yes")
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${CXX_FILESYSTEM_LIB} ${CXX_FILESYSTEM_LIB}
armadillo armadillo
Threads::Threads
${GFORT}
) )
target_include_directories( target_include_directories(
......
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