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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc7b1553d4d3a76f83dc10e8b66661886dae1093..01f86c0cf3e17bf2f30fc1a5ca612eed2ba29006 100644 (file)
--- 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 7b41e3f30cfa85de6b6a63cb29eb96d33fd5083b..988517bf5539da0c246e1ea5a4334804dfb9a3b7 100644 (file)
--- 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 3db7962eaf50734dd153ee6f84f0285eb7fb5d4c..f6b720df68bfa7bcc928aff960fe83182069b840 100644 (file)
--- 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++