From afc24160ea8682647d6ca8799a0c57b8d3e88ebb Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Mon, 6 Feb 2017 14:51:13 +0100
Subject: [PATCH] fix the generation of the pkgconfig file: missing header path
+ bad filter on -L/path/to/lib case
---
cmake_modules/GenPkgConfig.cmake | 19 ++++++++++++-------
lib/pkgconfig/chameleon-quark.pc.in | 2 +-
lib/pkgconfig/chameleon-starpu.pc.in | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/cmake_modules/GenPkgConfig.cmake b/cmake_modules/GenPkgConfig.cmake
index f847114bd..cde9c6954 100644
--- a/cmake_modules/GenPkgConfig.cmake
+++ b/cmake_modules/GenPkgConfig.cmake
@@ -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)
diff --git a/lib/pkgconfig/chameleon-quark.pc.in b/lib/pkgconfig/chameleon-quark.pc.in
index c53513b1a..36b42ec79 100644
--- a/lib/pkgconfig/chameleon-quark.pc.in
+++ b/lib/pkgconfig/chameleon-quark.pc.in
@@ -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@
diff --git a/lib/pkgconfig/chameleon-starpu.pc.in b/lib/pkgconfig/chameleon-starpu.pc.in
index c53513b1a..36b42ec79 100644
--- a/lib/pkgconfig/chameleon-starpu.pc.in
+++ b/lib/pkgconfig/chameleon-starpu.pc.in
@@ -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@
--
GitLab