From 042f9f1a8690e45164f99e6190f49ad61d503a7d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 26 May 2020 16:56:33 +0100 Subject: [PATCH] fix pkg-config file and cmake one Forwarded: not needed, upstream reworked the cmake handling Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/yaml-cpp/+bug/1880419 Last-Update: 2020-05-26 Gbp-Pq: Name fix-pkg-config.patch --- CMakeLists.txt | 2 +- yaml-cpp-config.cmake.in | 2 +- yaml-cpp.pc.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc7b155..01f86c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,7 +325,7 @@ export( export(PACKAGE yaml-cpp) set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets") -set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include") +set(CONFIG_INCLUDE_DIRS include) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in index 7b41e3f..988517b 100644 --- a/yaml-cpp-config.cmake.in +++ b/yaml-cpp-config.cmake.in @@ -5,7 +5,7 @@ # Compute paths get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") +set(YAML_CPP_INCLUDE_DIR "@INCLUDE_INSTALL_ROOT_DIR@") # Our library dependencies (contains definitions for IMPORTED targets) include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") diff --git a/yaml-cpp.pc.cmake b/yaml-cpp.pc.cmake index 3db7962..f6b720d 100644 --- a/yaml-cpp.pc.cmake +++ b/yaml-cpp.pc.cmake @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} includedir=${prefix}/@INCLUDE_INSTALL_ROOT_DIR@ -libdir=${exec_prefix}/@LIB_INSTALL_DIR@ +libdir=@LIB_INSTALL_DIR@ Name: Yaml-cpp Description: A YAML parser and emitter for C++ -- 2.30.2