Mentions légales du service

Skip to content
Snippets Groups Projects
Commit b411b555 authored by SYLVAND Guillaume's avatar SYLVAND Guillaume Committed by Mathieu Faverge
Browse files

Adapt to latest evolutions in hmat-oss CMake

lib is now called libhmat and target is well defined.
parent 2c1e236a
No related branches found
No related tags found
1 merge request!203Integrate H-Mat support via hmat-oss
......@@ -198,7 +198,7 @@ if (CHAMELEON_ENABLE_CUDA AND NOT CHAMELEON_USE_CUDA)
endif()
# Enable Hmat-OSS kernels
option(CHAMELEON_USE_HMAT "Enable hmat-oss kernels" OFF)
option(CHAMELEON_USE_HMAT "Enable hmat kernels" OFF)
option(CHAMELEON_RUNTIME_SYNC "Enable synchronous task submission when available to debug the code without parallelism" OFF)
if (CHAMELEON_RUNTIME_SYNC)
......@@ -271,14 +271,11 @@ add_subdirectory(hqr)
if ( CHAMELEON_USE_HMAT )
find_package(HMAT REQUIRED)
if(HMAT_FOUND)
# hmat-oss target is not correctly defined
add_library(HMAT::hmat-oss INTERFACE IMPORTED)
set_target_properties(HMAT::hmat-oss PROPERTIES
set_target_properties(HMAT::hmat PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${HMAT_INCLUDE_DIRS}"
INTERFACE_COMPILE_DEFINITIONS "${HMAT_DEFINITIONS}"
INTERFACE_LINK_DIRECTORIES "${HMAT_LIBRARY_DIRS}"
INTERFACE_LINK_LIBRARIES "hmat-oss"
INTERFACE_LINK_LIBRARIES "hmat"
)
message( STATUS "HMAT: Found" )
else()
......
......@@ -138,7 +138,7 @@ target_include_directories(coreblas PUBLIC
set_property(TARGET coreblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
if( CHAMELEON_USE_HMAT )
target_link_libraries(coreblas PUBLIC HMAT::hmat-oss )
target_link_libraries(coreblas PUBLIC HMAT::hmat )
endif()
target_link_libraries(coreblas PRIVATE MORSE::LAPACKE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment