Mentions légales du service

Skip to content
Snippets Groups Projects
Commit afc24160 authored by PRUVOST Florent's avatar PRUVOST Florent
Browse files

fix the generation of the pkgconfig file: missing header path + bad filter on -L/path/to/lib case

parent f345eb82
No related branches found
No related tags found
No related merge requests found
......@@ -95,13 +95,18 @@ MACRO(GENERATE_PKGCONFIG_FILE _file)
set(CHAMELEON_PKGCONFIG_LIBS_CPY "${CHAMELEON_PKGCONFIG_LIBS}")
set(CHAMELEON_PKGCONFIG_LIBS "")
foreach(_dep ${CHAMELEON_PKGCONFIG_LIBS_CPY})
get_filename_component(dep_we ${_dep} NAME)
STRING(REPLACE "lib" "-l" dep_we "${dep_we}")
STRING(REPLACE ".so" "" dep_we "${dep_we}")
STRING(REPLACE ".a" "" dep_we "${dep_we}")
STRING(REPLACE ".dylib" "" dep_we "${dep_we}")
STRING(REPLACE ".dll" "" dep_we "${dep_we}")
list(APPEND CHAMELEON_PKGCONFIG_LIBS ${dep_we})
if (NOT ${_dep} MATCHES "^-L")
get_filename_component(dep_we ${_dep} NAME)
message(STATUS "dep_we : ${dep_we}")
STRING(REPLACE "lib" "-l" dep_we "${dep_we}")
STRING(REPLACE ".so" "" dep_we "${dep_we}")
STRING(REPLACE ".a" "" dep_we "${dep_we}")
STRING(REPLACE ".dylib" "" dep_we "${dep_we}")
STRING(REPLACE ".dll" "" dep_we "${dep_we}")
list(APPEND CHAMELEON_PKGCONFIG_LIBS ${dep_we})
else()
list(APPEND CHAMELEON_PKGCONFIG_LIBS ${_dep})
endif()
endforeach()
list(REMOVE_DUPLICATES CHAMELEON_PKGCONFIG_LIBS)
......
......@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
Cflags: -I${includedir}
Cflags: -I${includedir} -I${includedir}/coreblas/include
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
......
......@@ -6,7 +6,7 @@ includedir=${exec_prefix}/include/chameleon
Name: chameleon
Description: Dense Linear Algebra for Scalable Multi-core Architectures and GPGPUs
Version: @CHAMELEON_VERSION_MAJOR@.@CHAMELEON_VERSION_MINOR@.@CHAMELEON_VERSION_PATCH@
Cflags: -I${includedir}
Cflags: -I${includedir} -I${includedir}/coreblas/include
Libs: -L${libdir} @CHAMELEON_PKGCONFIG_LIBS@
Libs.private: @CHAMELEON_PKGCONFIG_LIBS_PRIVATE@
Requires: @CHAMELEON_PKGCONFIG_REQUIRED@
......
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