Attention une mise à jour du service Gitlab va être effectuée le mardi 18 janvier (et non lundi 17 comme annoncé précédemment) entre 18h00 et 18h30. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit 0ae0534e authored by PRUVOST Florent's avatar PRUVOST Florent
Browse files

begin macro to install packages generically

parent 0facfde4
......@@ -303,7 +303,14 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/cmake_modules/")
list(APPEND CMAKE_EXE_LINKER_FLAGS "${BLAS_LINKER_FLAGS}")
endif()
else()
message(FATAL_ERROR "A BLAS library is required but has not been found")
message(FATAL_ERROR "BLAS library has not been found")
#install_package(BLAS DOWNLOAD)
#find_package(BLASEXT)
#if (BLAS_FOUND)
# message(STATUS "BLAS library has been found after automatic installation")
#else()
# message(FATAL_ERROR "BLAS library has not been found after automatic installation")
#endif()
endif()
if(CBLAS_FOUND)
include_directories(${CBLAS_INCLUDE_DIRS})
......
......@@ -46,6 +46,9 @@ include(AuxilaryFlags)
# Add the path where we handle our FindFOO.cmake to seek for liraries
list(APPEND CMAKE_MODULE_PATH ${MORSE_CMAKE_MODULE_PATH}/find)
# Install libraries if not discovered on the system
include(InstallPackage)
option(MORSE_VERBOSE_FIND_PACKAGE "Add additional messages concerning no found packages" OFF)
#message("-- ${BoldGreen}MORSE_VERBOSE_FIND_PACKAGE is set to OFF, turn it ON to get"
# "information about packages not found${ColourReset}")
......
......@@ -102,7 +102,9 @@ endif()
if (CBLAS_FIND_COMPONENTS)
foreach( component ${CBLAS_FIND_COMPONENTS} )
if(CBLAS_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
if (CBLAS_FIND_REQUIRED)
find_package(${component} REQUIRED)
endif()
else()
find_package(${component})
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment