From be35da0b6eccc59e5c2c59cdce4ddabcd39d4cab Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Wed, 20 Feb 2019 18:47:04 +0100
Subject: [PATCH] FIX: Trying to fix CI with OpenBLAS
---
.gitlab-ci.yml | 1 +
CMakeLists.txt | 33 +++++++++++++++++----------------
FindOpenBLAS.cmake | 18 ++++++++++++------
3 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c56dc1dd..ba66a767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ ubuntu_boost_local_static_deps:
script:
- cd ../..
+ - ls external_dependencies/*
- cd build_scripts/linux
# - './linux_run_tests.sh'
- cd ../..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ad955a6..4fd6226d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,17 @@ if(N_CORES GREATER 1)
endif()
message("Build will be performed on ${N_CORES} cores.")
+#---------------#
+# Set variables #
+#---------------#
+set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+set(LROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/src)
+set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_LIST_DIR}/build)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+
#----------------------------------------#
# Set prefixes and suffixes of libraries #
#----------------------------------------#
@@ -159,25 +170,15 @@ if(NOT ARMADILLO_FOUND AND ALLOW_DEPENDENCIES_DOWNLOAD)
include(DownloadArmadillo)
endif()
-#---------------#
-# Set variables #
-#---------------#
-set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/src)
-set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_LIST_DIR}/build)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
-
#----------------------------------------#
# Dependencies for the lib4neuro library #
#----------------------------------------#
message("Running CMake in: ${SRC_DIR} ${PROJECT_BINARY_DIR}")
-
-if("${BUILD_LIB}" STREQUAL "no")
-
- link_directories(${LIB4NEURO_DIR})
-
-endif()
+#
+#if("${BUILD_LIB}" STREQUAL "no")
+#
+# link_directories(${LIB4NEURO_DIR})
+#
+#endif()
add_subdirectory(${SRC_DIR} ${PROJECT_BINARY_DIR})
diff --git a/FindOpenBLAS.cmake b/FindOpenBLAS.cmake
index 506c0157..2f456c19 100644
--- a/FindOpenBLAS.cmake
+++ b/FindOpenBLAS.cmake
@@ -11,9 +11,12 @@ FIND_PATH(
HINTS
${OpenBLAS_INCLUDE_DIRECTORY}
$ENV{OpenBLAS_INCLUDE_DIRECTORY}
- /usr/include/
- /usr/include/x86_64-linux-gnu
- external_dependencies/OpenBLAS
+ ${ROOT_DIR}/external_dependencies/OpenBLAS
+ /usr
+
+ PATH_SUFFIXES
+ include
+ include/x86_64-linux-gnu
)
FIND_LIBRARY(OpenBLAS_LIBRARIES
@@ -23,9 +26,12 @@ FIND_LIBRARY(OpenBLAS_LIBRARIES
HINTS
${OpenBLAS_LIBRARY_DIRECTORY}
$ENV{OpenBLAS_LIBRARY_DIRECTORY}
- /usr/lib
- /usr/lib/x86_64-linux-gnu
- external_dependencies/OpenBLAS/lib
+ ${ROOT_DIR}/external_dependencies/OpenBLAS
+ /usr
+
+ PATH_SUFFIXES
+ lib
+ lib/x86_64-linux-gnu
)
# Set OpenBLAS_Found
--
GitLab