From e012450662f7b938892c754d2f5946447195d147 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 11 Aug 2022 09:37:59 +0800 Subject: [PATCH] fix: use correct path in pkgconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Log: 完善 pkgconfig 路径问题 --- CMakeLists.txt | 3 +-- dde-dock.pc.in | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd80752ce..2f16ff201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.7) set(VERSION 4.0) -configure_file(dde-dock.pc.in dde-dock.pc @ONLY) - project(dde-dock) #set(CMAKE_VERBOSE_MAKEFILE ON) @@ -116,6 +114,7 @@ install(FILES ${QM_FILES} install(FILES ${INTERFACES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dde-dock) +configure_file(dde-dock.pc.in dde-dock.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/dde-dock.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/dde-dock.pc.in b/dde-dock.pc.in index a3d26a4df..8e4c8e83b 100644 --- a/dde-dock.pc.in +++ b/dde-dock.pc.in @@ -1,11 +1,11 @@ -prefix=/usr +prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/lib/@HOST_MULTIARCH@ -includedir=${prefix}/include/dde-dock +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/dde-dock -Name: dde dock +Name: dde-dock Description: dock dev header for deepin -Version: 1.0 +Version: @VERSION@ Libs: Cflags: -I${includedir} Requires: