diff -Nru cmake-3.10.2/debian/changelog cmake-3.10.2/debian/changelog
--- cmake-3.10.2/debian/changelog	2019-07-27 04:26:41.000000000 +0000
+++ cmake-3.10.2/debian/changelog	2021-05-15 04:26:55.000000000 +0000
@@ -1,8 +1,18 @@
-cmake (3.10.2-1ubuntu2.18.04.1~cloud0) xenial-queens; urgency=medium
+cmake (3.10.2-1ubuntu2.18.04.2~cloud0) xenial-queens; urgency=medium
 
   * New update for the Ubuntu Cloud Archive.
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Sat, 27 Jul 2019 04:26:41 +0000
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Sat, 15 May 2021 04:26:55 +0000
+
+cmake (3.10.2-1ubuntu2.18.04.2) bionic; urgency=medium
+
+  [ Matwey V. Kornilov ]
+  * debian/patches/0001-FindPkgConfig-correct-library-search-path-for-
+    import.patch: Cherry-pick upstream fix for pkg-config failure to find
+    the library if -L was provided (and library not in that path)
+    LP: #1922417
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 04 Apr 2021 16:10:12 +0200
 
 cmake (3.10.2-1ubuntu2.18.04.1) bionic; urgency=medium
 
diff -Nru cmake-3.10.2/debian/patches/0001-FindPkgConfig-correct-library-search-path-for-import.patch cmake-3.10.2/debian/patches/0001-FindPkgConfig-correct-library-search-path-for-import.patch
--- cmake-3.10.2/debian/patches/0001-FindPkgConfig-correct-library-search-path-for-import.patch	1970-01-01 00:00:00.000000000 +0000
+++ cmake-3.10.2/debian/patches/0001-FindPkgConfig-correct-library-search-path-for-import.patch	2021-04-04 14:10:12.000000000 +0000
@@ -0,0 +1,51 @@
+From ac5731a7e380349f19dc319e6c31e189b5faba93 Mon Sep 17 00:00:00 2001
+From: Aleksandr Mezin <mezin.alexander@gmail.com>
+Date: Wed, 2 May 2018 04:16:55 +0600
+Subject: [PATCH] FindPkgConfig: correct library search path for imported
+ targets.
+
+`-L` in LDFLAGS doesn't mean that standard search paths should be
+excluded. Example:
+
+    $ pkg-config --libs libmutter-2
+    -L/usr/lib/mutter -lmutter-2 -lgtk-3 -lgdk-3 -lmutter-clutter-2 -lcairo-gobject -latk-1.0 -lpangocairo-1.0 -lpango-1.0 -lfribidi -ljson-glib-1.0 -lgio-2.0 -lwayland-egl -lwayland-client -lXtst -lXi -lmutter-cogl-2 -lcairo
+-lgmodule-2.0 -pthread -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lgbm -ldrm -lwayland-server -lEGL -lXext -lXdamage -lXfixes -lXcomposite -lXrandr -lX11
+
+Most of these libraries are located at standard paths, not in
+`/usr/lib/mutter`.
+
+Fixes: #17954
+---
+ Modules/FindPkgConfig.cmake | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 415e914297..95af0bf52a 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -196,9 +196,7 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
+   unset(_search_paths)
+   foreach (flag IN LISTS ${_prefix}_LDFLAGS)
+     if (flag MATCHES "^-L(.*)")
+-      # only look into the given paths from now on
+       list(APPEND _search_paths ${CMAKE_MATCH_1})
+-      set(_find_opts HINTS ${_search_paths} NO_DEFAULT_PATH)
+       continue()
+     endif()
+     if (flag MATCHES "^-l(.*)")
+@@ -207,6 +205,12 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
+       continue()
+     endif()
+ 
++    if(_search_paths)
++        # Firstly search in -L paths
++        find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
++                     NAMES ${_pkg_search}
++                     HINTS ${_search_paths} NO_DEFAULT_PATH)
++    endif()
+     find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
+                  NAMES ${_pkg_search}
+                  ${_find_opts})
+-- 
+2.26.2
+
diff -Nru cmake-3.10.2/debian/patches/series cmake-3.10.2/debian/patches/series
--- cmake-3.10.2/debian/patches/series	2019-07-13 07:20:51.000000000 +0000
+++ cmake-3.10.2/debian/patches/series	2021-04-04 14:10:12.000000000 +0000
@@ -3,3 +3,4 @@
 fix-ftbfs-on-kfreebsd.patch
 3c08d2075fae7ef62838f18e1af5d398c6401572.diff
 1893.patch
+0001-FindPkgConfig-correct-library-search-path-for-import.patch