From 6b2b9c4ff4ef51cc2abe68ca3381f044f7c1de1b Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Tue, 3 Mar 2020 14:57:20 -0600 Subject: [PATCH] build: Adjust usage of pkgconfig. The existing thing would find pkg-config when cross-building for 32-bit, but then immediately complain it wasn't found. --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b59bbfa12..ff7fcb162 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,16 +44,17 @@ pkg_check_modules(FFMPEG libavcodec) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") # Compositor backend find_package(X11) - find_package(PkgConfig REQUIRED) - pkg_check_modules(XCB xcb xcb-randr) + find_package(PkgConfig) find_package(udev REQUIRED) set(BUILD_DRIVER_V4L2 TRUE) + if(PKGCONFIG_FOUND) + pkg_check_modules(XCB xcb xcb-randr) - pkg_search_module(WAYLAND wayland-client) - pkg_search_module(WAYLAND_SCANNER wayland-scanner) - pkg_search_module(WAYLAND_PROTOCOLS wayland-protocols) - + pkg_search_module(WAYLAND wayland-client) + pkg_search_module(WAYLAND_SCANNER wayland-scanner) + pkg_search_module(WAYLAND_PROTOCOLS wayland-protocols) + endif() find_package(OpenGL COMPONENTS GLX) else() find_package(OpenGL)