Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 83516694 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'cmake-ci' into 'main'

Cmake ci

See merge request !24
parents d78eec77 ce6d5563
Branches
No related tags found
1 merge request!24Cmake ci
Pipeline #1122852 passed
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
--- ---
preliminary_checks: preliminary_checks:
stage: pre stage: pre
image: registry.gitlab.inria.fr/solverstack/docker/pre
interruptible: true interruptible: true
rules: rules:
- if: ($CI_PIPELINE_SOURCE == "merge_request_event") - if: ($CI_PIPELINE_SOURCE == "merge_request_event")
......
...@@ -125,13 +125,13 @@ list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ...@@ -125,13 +125,13 @@ list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
# RAPACK depends on check libm # RAPACK depends on check libm
#----------------------------- #-----------------------------
find_package(M REQUIRED) find_package(M REQUIRED)
morse_export_imported_target(MORSE M m rapack) morse_export_imported_target(MORSE::M m rapack)
# RAPACK depends on Lapacke and CBLAS # RAPACK depends on Lapacke and CBLAS
#--------------------------------- #---------------------------------
set( CBLAS_MT ${RAPACK_MULTITHREAD} ) set( CBLAS_MT ${RAPACK_MULTITHREAD} )
find_package(CBLAS REQUIRED) find_package(CBLAS REQUIRED)
morse_export_imported_target(MORSE CBLAS cblas rapack) morse_export_imported_target(MORSE::CBLAS cblas rapack)
## Tests requires TMG lib to generate random matrices. ## Tests requires TMG lib to generate random matrices.
set( LAPACKE_MT ${RAPACK_MULTITHREAD} ) set( LAPACKE_MT ${RAPACK_MULTITHREAD} )
...@@ -141,7 +141,7 @@ if (RAPACK_ENABLE_TESTINGS) ...@@ -141,7 +141,7 @@ if (RAPACK_ENABLE_TESTINGS)
else() else()
find_package(LAPACKE REQUIRED) find_package(LAPACKE REQUIRED)
endif() endif()
morse_export_imported_target(MORSE LAPACKE lapacke rapack) morse_export_imported_target(MORSE::LAPACKE lapacke rapack)
# Configuration header # Configuration header
#--------------------- #---------------------
......
Subproject commit c480b7f79a36a9bfc96c67fb0f8df539ce23c371 Subproject commit bc34cfd2ce19d525e2e6a82b7ec6c8bca45e2c97
...@@ -118,9 +118,9 @@ target_link_libraries(rapack PRIVATE MORSE::M) ...@@ -118,9 +118,9 @@ target_link_libraries(rapack PRIVATE MORSE::M)
# export targets of dependencies is rapack static # export targets of dependencies is rapack static
if (NOT BUILD_SHARED_LIBS) if (NOT BUILD_SHARED_LIBS)
morse_export_imported_target(MORSE LAPACKE lapacke rapack) morse_export_imported_target(MORSE::LAPACKE lapacke rapack)
morse_export_imported_target(MORSE CBLAS cblas rapack) morse_export_imported_target(MORSE::CBLAS cblas rapack)
morse_export_imported_target(MORSE M m rapack) morse_export_imported_target(MORSE::M m rapack)
endif() endif()
# export target rapack # export target rapack
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment