diff -Nru cmake-3.5.0/debian/changelog cmake-3.5.0/debian/changelog --- cmake-3.5.0/debian/changelog 2016-03-29 19:57:45.000000000 +0200 +++ cmake-3.5.0/debian/changelog 2016-03-30 00:33:07.000000000 +0200 @@ -1,3 +1,10 @@ +cmake (3.5.0-1ubuntu3) xenial; urgency=medium + + * Fix FindPkgModules.cmake (LP: #1563548) + seems that a typo was preventing the correct internal variables from being set. + + -- Gianfranco Costamagna Wed, 30 Mar 2016 00:19:04 +0200 + cmake (3.5.0-1ubuntu2) xenial; urgency=medium * Add again MultiaArchCross.cmake file. diff -Nru cmake-3.5.0/debian/patches/fix-broken-pkg-support.patch cmake-3.5.0/debian/patches/fix-broken-pkg-support.patch --- cmake-3.5.0/debian/patches/fix-broken-pkg-support.patch 1970-01-01 01:00:00.000000000 +0100 +++ cmake-3.5.0/debian/patches/fix-broken-pkg-support.patch 2016-03-30 00:33:00.000000000 +0200 @@ -0,0 +1,27 @@ +Description: Fix broken pkg-config support in xenial + Seems that the variable were filled in _pkg_check_prefix and saved in a + different name _pkg_check_modules_pkg. + this leads to variable saved in form of glib-2.0_INCLUDEDIR instead of + the correct GLIB2_INCLUDEDIR. + . + This patch restores the old GLIB2_INCLUDEDIR variable, and fixes the + empty glib-2.0_INCLUDEDIR new version because of the typo in the set command + . + The macro uses the first parameter "_pkg_check_prefix" as result variable, + and then the result has to be taken from there. + +Author: Gianfranco Costamagna +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1563548 + +--- cmake-3.5.0.orig/Modules/FindPkgConfig.cmake ++++ cmake-3.5.0/Modules/FindPkgConfig.cmake +@@ -387,7 +387,8 @@ macro(_pkg_check_modules_internal _is_re + pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir") + pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir") + foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR) +- _pkgconfig_set("${_pkg_check_modules_pkg}_${variable}" "${${_pkg_check_modules_pkg}_${variable}}") ++ _pkgconfig_set("${_pkg_check_modules_pkg}_${variable}" "${${_pkg_check_prefix}_${variable}}") ++ _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}") + endforeach () + + if (NOT ${_is_silent}) diff -Nru cmake-3.5.0/debian/patches/series cmake-3.5.0/debian/patches/series --- cmake-3.5.0/debian/patches/series 2016-03-22 17:32:36.000000000 +0100 +++ cmake-3.5.0/debian/patches/series 2016-03-30 00:22:23.000000000 +0200 @@ -3,3 +3,4 @@ fix-ftbfs-on-kfreebsd.patch ubuntu_boost-multiarch.patch ubuntu_cmake-crosscompile.patch +fix-broken-pkg-support.patch