diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c56dc1dd00268b3e9a8091971467518aecb833d1..ba66a767de973f35bd987b1208dd65c44d7d7e66 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 3ad955a65fcee29a52a73b32b02ac30dd81878f6..4fd6226d7da85e85c5efc5c912d014326b1830da 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 506c015753c76584479d26d081bd04b23b31c490..2f456c19bad7e2d03af804938c25a6309dc22ec3 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