From 6edc32848f67fe3ea370e12b64019cef6c137840 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 11 Oct 2017 21:04:56 -0400 Subject: [PATCH] Find and link to wlroots --- CMake/FindWlroots.cmake | 20 ++++++++++++++++++++ CMakeLists.txt | 1 + sway/CMakeLists.txt | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 CMake/FindWlroots.cmake diff --git a/CMake/FindWlroots.cmake b/CMake/FindWlroots.cmake new file mode 100644 index 000000000..0e349d3ac --- /dev/null +++ b/CMake/FindWlroots.cmake @@ -0,0 +1,20 @@ +# - Find wlroots +# Find the wlroots libraries +# +# This module defines the following variables: +# WLR_FOUND - True if wlroots is found +# WLR_LIBRARIES - wlroots libraries +# WLR_INCLUDE_DIRS - wlroots include directories +# WLR_DEFINITIONS - Compiler switches required for using wlroots +# + +find_package(PkgConfig) +pkg_check_modules(PC_WLR QUIET wlroots) +find_path(WLR_INCLUDE_DIRS NAMES wlr/config.h HINTS ${PC_WLR_INCLUDE_DIRS}) +find_library(WLR_LIBRARIES NAMES wlroots HINTS ${PC_WLR_LIBRARY_DIRS}) + +set(WLR_DEFINITIONS ${PC_WLR_CFLAGS_OTHER}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(wlr DEFAULT_MSG WLR_LIBRARIES WLR_INCLUDE_DIRS) +mark_as_advanced(WLR_LIBRARIES WLR_INCLUDE_DIRS) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc5215708..34098eb36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ endif() find_package(JsonC 0.12.1 REQUIRED) find_package(PCRE REQUIRED) find_package(WLC REQUIRED) +find_package(Wlroots REQUIRED) find_package(Wayland REQUIRED) find_package(XKBCommon REQUIRED) find_package(Cairo REQUIRED) diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 48f7a7a82..67af0f70f 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt @@ -1,6 +1,7 @@ include_directories( ${PROTOCOLS_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS} + ${WLR_INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS} @@ -48,6 +49,7 @@ target_link_libraries(sway sway-protocols sway-wayland ${WLC_LIBRARIES} + ${WLR_LIBRARIES} ${XKBCOMMON_LIBRARIES} ${PCRE_LIBRARIES} ${JSONC_LIBRARIES}