Fix: Kernel detection under Yocto build env

[staging/xdg-launcher.git] / cmake / cmake.d / 04-build_options.cmake

diff --git a/cmake/cmake.d/04-build_options.cmake b/cmake/cmake.d/04-build_options.cmake
index 3a1fc81..1aa046a 100644 (file)
--- a/cmake/cmake.d/04-build_options.cmake
+++ b/cmake/cmake.d/04-build_options.cmake
@@ -21,7 +21,7 @@
 #--------------------------------------------------------------------------
 #  WARNING:
 #     Do not change this cmake template
-#     Customise your preferences in "./etc/config.cmake"
+#     Customise your preferences in "./conf.d/cmake/config.cmake"
 #--------------------------------------------------------------------------
 
 # Check GCC minimal version
@@ -37,6 +37,8 @@ endif(gcc_minimal_version)
 if (kernel_minimal_version)
        if(DEFINED ENV{SDKTARGETSYSROOT})
                file(STRINGS $ENV{SDKTARGETSYSROOT}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
+       elseif(DEFINED ENV{PKG_CONFIG_SYSROOT_DIR})
+               file(STRINGS $ENV{PKG_CONFIG_SYSROOT_DIR}/usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
        else()
                file(STRINGS /usr/include/linux/version.h LINUX_VERSION_CODE_LINE REGEX "LINUX_VERSION_CODE")
        endif()
@@ -89,9 +91,6 @@ else()
 endif()
 set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE STRING "Installation Prefix")
 
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
-set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON CACHE BOOLEAN "Flag for using prefix path")
-
 # Loop on required package and add options
 foreach (PKG_CONFIG ${PKG_REQUIRED_LIST})
        string(REGEX REPLACE "[<>]?=.*$" "" XPREFIX ${PKG_CONFIG})