From 20ada7d3478a9ae87382100cd6d26bc1c9e05aac Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 18 Jan 2016 22:45:40 +0100 Subject: [PATCH] Fix pkg-config generation. --- rdtk/CMakeLists.txt | 3 +-- winpr/winpr.pc.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rdtk/CMakeLists.txt b/rdtk/CMakeLists.txt index 6faea30..08b7648 100644 --- a/rdtk/CMakeLists.txt +++ b/rdtk/CMakeLists.txt @@ -73,6 +73,7 @@ if(WITH_SAMPLE) endif() # Exporting +set(RDTK_INCLUDE_DIR "include/rdtk${RDTK_VERSION_MAJOR}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rdtk.pc.in ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rdtk${RDTK_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) @@ -81,8 +82,6 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") set(RDTK_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/RdTk${RDTK_VERSION_MAJOR}") - set(RDTK_INCLUDE_DIR "include/rdtk${RDTK_VERSION_MAJOR}") - configure_package_config_file(RdTkConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/RdTkConfig.cmake INSTALL_DESTINATION ${RDTK_CMAKE_INSTALL_DIR} PATH_VARS RDTK_INCLUDE_DIR) diff --git a/winpr/winpr.pc.in b/winpr/winpr.pc.in index 58dc08a..4c30637 100644 --- a/winpr/winpr.pc.in +++ b/winpr/winpr.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=${libdir}/@WINPR_INCLUDE_DIR@ +includedir=${prefix}/@WINPR_INCLUDE_DIR@ libs=-lwinpr Name: WinPR -- 2.7.4