glog: fix searching for Libunwind

* it used to be part of 0003-installation-path-fix.patch which was removed during
  the upgrade to 0.4.0 and now some recipes (e.g. mtp-server from meta-luneos) are
  failing like:
  CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/tissot-webos-linux/mtp-server/0.0.3+gitAUTOINC+bb4a81e61b-r0/recipe-sysroot-native/usr/share/cmake-3.19/Modules/CMakeFindDependencyMacro.cmake:47 (find_package):
    By not providing "FindLibunwind.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "Libunwind", but CMake did not find one.

    Could not find a package configuration file provided by "Libunwind" with
    any of the following names:

      LibunwindConfig.cmake
      libunwind-config.cmake

    Add the installation prefix of "Libunwind" to CMAKE_PREFIX_PATH or set
    "Libunwind_DIR" to a directory containing one of the above files.  If
    "Libunwind" provides a separate development package or SDK, be sure it has
    been installed.
  Call Stack (most recent call first):
    /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/tissot-webos-linux/mtp-server/0.0.3+gitAUTOINC+bb4a81e61b-r0/recipe-sysroot/usr/lib/cmake/glog/glog-config.cmake:35 (find_dependency)
    CMakeLists.txt:17 (find_package)

  because LibunwindConfig.cmake is provided by glog as:
  recipe-sysroot/usr/lib/cmake/glog/FindLibunwind.cmake
  but this directory wasn't searched by CMake.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa
2021-03-10 19:17:48 +01:00
committed by Khem Raj
parent 9e20a2f41a
commit 3c4e544007
@@ -109,10 +109,11 @@
install (EXPORT glog-targets NAMESPACE glog:: DESTINATION
--- a/glog-config.cmake.in
+++ b/glog-config.cmake.in
@@ -8,4 +8,6 @@ include (CMakeFindDependencyMacro)
@@ -8,4 +8,7 @@ include (CMakeFindDependencyMacro)
@gflags_DEPENDENCY@
+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+find_dependency (Libunwind)
+
include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake")