From: Alberto Sartori Date: Tue, 13 Nov 2018 11:22:04 +0000 (+0100) Subject: fix libs flags for pkgconfig files X-Git-Tag: v9.1.0-rc1~551^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758a3ad42af1d3f020784b65c83bf9a8b4a5641b;p=dealii.git fix libs flags for pkgconfig files --- diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index cf6face967..7ed5252f21 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -257,7 +257,7 @@ FOREACH(_build ${DEAL_II_BUILD_TYPES}) SET(_name "${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}") SET(CONFIG_RPATH_${_build}_PC "") - SET(CONFIG_LIBRARIES_${_build}_PC "-L\${libdir} -l${_name}") + SET(CONFIG_LIBRARIES_${_build}_PC "-l${_name}") FOREACH(_lib ${DEAL_II_LIBRARIES_${_build}} ${DEAL_II_LIBRARIES}) diff --git a/cmake/config/config_base.pc.in b/cmake/config/config_base.pc.in index cd8573e8b4..15d1ee9ee5 100644 --- a/cmake/config/config_base.pc.in +++ b/cmake/config/config_base.pc.in @@ -1,5 +1,4 @@ prefix=@CONFIG_PATH_PC@ -includedir=${prefix}/@DEAL_II_INCLUDE_RELDIR@ libdir=${prefix}/@DEAL_II_LIBRARY_RELDIR@ Name: deal.II_base @@ -7,4 +6,4 @@ Description: base file used by the debug and release versions Version: @DEAL_II_VERSION@ URL: https://github.com/dealii/dealii Cflags: @DEAL_II_CXX_FLAGS@ @CONFIG_INCLUDE_DIRS_PC@ -Libs: @DEAL_II_LINKER_FLAGS@ +Libs: @DEAL_II_LINKER_FLAGS@ -L${libdir} -Wl,-rpath,${libdir}