sync with upstream

1 files changed, 6 insertions, 20 deletions

diff --git a/cmake/modules/FindXkbcommon.cmake b/cmake/modules/FindXkbcommon.cmake
index 88c6121..2a84fe5 100644
--- a/cmake/modules/FindXkbcommon.cmake
+++ b/cmake/modules/FindXkbcommon.cmake
@@ -9,27 +9,13 @@
 # XKBCOMMON_LIBRARIES    - the libxkbcommon libraries
 # XKBCOMMON_DEFINITIONS  - the libxkbcommon definitions
 
-
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules (PC_XKBCOMMON xkbcommon QUIET)
-endif()
-
-find_path(XKBCOMMON_INCLUDE_DIR NAMES xkbcommon/xkbcommon.h
-                                PATHS ${PC_XKBCOMMON_INCLUDE_DIRS})
-
-find_library(XKBCOMMON_LIBRARY NAMES xkbcommon
-                               PATHS ${PC_XKBCOMMON_LIBRARIES} ${PC_XKBCOMMON_LIBRARY_DIRS})
+pkg_check_modules (XKBCOMMON xkbcommon)
 
 include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (XKBCOMMON
+find_package_handle_standard_args (Xkbcommon
   REQUIRED_VARS
-  XKBCOMMON_INCLUDE_DIR
-  XKBCOMMON_LIBRARY)
-
-if (XKBCOMMON_FOUND)
-  set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LIBRARY})
-  set(XKBCOMMON_INCLUDE_DIRS ${PC_XKBCOMMON_INCLUDE_DIRS})
-  set(XKBCOMMON_DEFINITIONS -DHAVE_XKBCOMMON=1)
-endif()
+  XKBCOMMON_FOUND)
 
-mark_as_advanced (XKBCOMMON_LIBRARY XKBCOMMON_INCLUDE_DIR)
\ No newline at end of file
+set(XKBCOMMON_DEFINITIONS -DHAVE_XKBCOMMON=1)
+set(XKBCOMMON_LIBRARIES ${XKBCOMMON_LDFLAGS})
+set(XKBCOMMON_INCLUDE_DIRS ${XKBCOMMON_INCLUDEDIR})