FIX: Trying to fix CI...

CMakeLists.txt

@@ -156,13 +156,15 @@ endif()
 message("Checking Armadillo dependencies")
 find_package(LAPACK)
 find_package(BLAS)
+
 set(ARMA_LIBS "")
 if(NOT LAPACK_FOUND AND NOT BLAS_FOUND)
     find_package(OpenBLAS)
     if(NOT OpenBLAS_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
         # Download and build OpenBLAS locally
-        message("LAPACK nor BLAS were found - OpenBLAS will be downloaded and built.")
+        message("Nor LAPACK nor BLAS were found - OpenBLAS will be downloaded and built.")
         include(DownloadOpenBLAS)
+        find_package(OpenBLAS)
     endif()
 endif()
 set(ARMA_LIBS "${OpenBLAS_LIBRARIES}")
@@ -173,14 +175,14 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
     message("Armadillo will be downloaded and compiled locally in 'external_dependencies folder.")
     include(DownloadArmadillo)
 
-    if(NOT LAPACK_FOUND AND NOT BLAS_FOUND)
-    target_link_libraries(
-        armadillo
-
-        PUBLIC
-        openblas
-    )
-    endif()
+#    if(NOT LAPACK_FOUND AND NOT BLAS_FOUND)
+#    target_link_libraries(
+#        armadillo
+#
+#        PUBLIC
+#        openblas
+#    )
+#    endif()
 endif()
 
 #---------------------------------------------------#

DownloadOpenBLAS.cmake

@@ -15,33 +15,36 @@ FetchContent_Declare(
 
 set(FETCHCONTENT_QUIET FALSE)
 
-FetchContent_Populate(OpenBLAS)
+if(NOT OpenBLAS_POPULATED)
+    FetchContent_Populate(OpenBLAS)
+    #add_subdirectory(${OPENBLAS_LOCAL_PATH} ${OPENBLAS_LOCAL_PATH}/build)
+endif()
 
 ##################
 # Build OpenBLAS #
 ##################
-#execute_process(
-#    COMMAND cmake -j ${N_CORES} .
-#    WORKING_DIRECTORY ${OPENBLAS_LOCAL_PATH}
-#    RESULT_VARIABLE rv
-#)
-#if(NOT rv STREQUAL "0")
-#    message("OpenBLAS build: cmake .: ${rv}")
-#endif()
-#
-## Build library
-#execute_process(
-#    COMMAND cmake --build . -j ${N_CORES} --config Release
-#    WORKING_DIRECTORY ${OPENBLAS_LOCAL_PATH}
-#    RESULT_VARIABLE rv
-#)
-#if(NOT rv STREQUAL "0")
-#    message("OpenBLAS build: cmake --build . -j ${N_CORES}: ${rv}")
-#endif()
+execute_process(
+    COMMAND cmake -j ${N_CORES} .
+    WORKING_DIRECTORY ${OPENBLAS_LOCAL_PATH}
+    RESULT_VARIABLE rv
+)
+if(NOT rv STREQUAL "0")
+    message("OpenBLAS build: cmake .: ${rv}")
+endif()
+
+# Build library
+execute_process(
+    COMMAND cmake --build . -j ${N_CORES} --config Release
+    WORKING_DIRECTORY ${OPENBLAS_LOCAL_PATH}
+    RESULT_VARIABLE rv
+)
+if(NOT rv STREQUAL "0")
+    message("OpenBLAS build: cmake --build: ${rv}")
+endif()
 
 find_package(OpenBLAS)
-#
-#if(NOT OpenBLAS_FOUND)
-#    message(FATAL_ERROR "OpenBLAS was not downloaded successfully!")
-#endif()
+
+if(NOT OpenBLAS_FOUND)
+    message(FATAL_ERROR "OpenBLAS was not downloaded successfully!")
+endif()
 

FindOpenBLAS.cmake

@@ -19,22 +19,18 @@ FIND_PATH(
         include/x86_64-linux-gnu
 )
 
-#option(LOCAL OFF)
 IF(${OpenBLAS_INCLUDE_DIR} MATCHES "^.*external_dependencies.*$")
-    message("OpenBLAS is downloaded locally - the library will be built when needed.")
-    set(LOCAL ON)
-    set(TMP "")
-    string(REGEX REPLACE "/include" "" TMP ${OpenBLAS_INCLUDE_DIR})
-    add_subdirectory(${TMP} ${TMP})
-endif()
-
-if(LOCAL)
     # 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(
@@ -67,11 +63,17 @@ else()
                 OpenBLAS_INCLUDE_DIR
                 OpenBLAS_LIBRARIES
     )
+
+    if(OpenBLAS_FOUND)
+        MESSAGE(STATUS "Found OpenBLAS libraries: ${OpenBLAS_LIBRARIES}")
+        MESSAGE(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")
+    endif()
+
 endif()
 
-IF (OpenBLAS_FOUND)
-   MESSAGE(STATUS "Found OpenBLAS libraries: ${OpenBLAS_LIBRARIES}")
-   MESSAGE(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")
-ELSE()
-    MESSAGE("Could not find OpenBLAS")
-ENDIF()
+#IF (OpenBLAS_LIBRARIES)
+##   MESSAGE(STATUS "Found OpenBLAS libraries: ${OpenBLAS_LIBRARIES}")
+#   MESSAGE(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")
+#ELSE()
+#    MESSAGE("Could not find OpenBLAS")
+#ENDIF()