diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-11 21:04:56 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-11-11 09:08:50 -0500 |
commit | 6edc32848f67fe3ea370e12b64019cef6c137840 (patch) | |
tree | 9f5fb4021a3ebe8686d0d4acd3e4ba0d3bca5ee7 | |
parent | Merge pull request #1455 from etam/dbus_dependency (diff) | |
download | sway-6edc32848f67fe3ea370e12b64019cef6c137840.tar.gz sway-6edc32848f67fe3ea370e12b64019cef6c137840.tar.zst sway-6edc32848f67fe3ea370e12b64019cef6c137840.zip |
Find and link to wlroots
-rw-r--r-- | CMake/FindWlroots.cmake | 20 | ||||
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | sway/CMakeLists.txt | 2 |
3 files changed, 23 insertions, 0 deletions
diff --git a/CMake/FindWlroots.cmake b/CMake/FindWlroots.cmake new file mode 100644 index 00000000..0e349d3a --- /dev/null +++ b/CMake/FindWlroots.cmake | |||
@@ -0,0 +1,20 @@ | |||
1 | # - Find wlroots | ||
2 | # Find the wlroots libraries | ||
3 | # | ||
4 | # This module defines the following variables: | ||
5 | # WLR_FOUND - True if wlroots is found | ||
6 | # WLR_LIBRARIES - wlroots libraries | ||
7 | # WLR_INCLUDE_DIRS - wlroots include directories | ||
8 | # WLR_DEFINITIONS - Compiler switches required for using wlroots | ||
9 | # | ||
10 | |||
11 | find_package(PkgConfig) | ||
12 | pkg_check_modules(PC_WLR QUIET wlroots) | ||
13 | find_path(WLR_INCLUDE_DIRS NAMES wlr/config.h HINTS ${PC_WLR_INCLUDE_DIRS}) | ||
14 | find_library(WLR_LIBRARIES NAMES wlroots HINTS ${PC_WLR_LIBRARY_DIRS}) | ||
15 | |||
16 | set(WLR_DEFINITIONS ${PC_WLR_CFLAGS_OTHER}) | ||
17 | |||
18 | include(FindPackageHandleStandardArgs) | ||
19 | find_package_handle_standard_args(wlr DEFAULT_MSG WLR_LIBRARIES WLR_INCLUDE_DIRS) | ||
20 | mark_as_advanced(WLR_LIBRARIES WLR_INCLUDE_DIRS) | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index dc521570..34098eb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -62,6 +62,7 @@ endif() | |||
62 | find_package(JsonC 0.12.1 REQUIRED) | 62 | find_package(JsonC 0.12.1 REQUIRED) |
63 | find_package(PCRE REQUIRED) | 63 | find_package(PCRE REQUIRED) |
64 | find_package(WLC REQUIRED) | 64 | find_package(WLC REQUIRED) |
65 | find_package(Wlroots REQUIRED) | ||
65 | find_package(Wayland REQUIRED) | 66 | find_package(Wayland REQUIRED) |
66 | find_package(XKBCommon REQUIRED) | 67 | find_package(XKBCommon REQUIRED) |
67 | find_package(Cairo REQUIRED) | 68 | find_package(Cairo REQUIRED) |
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 48f7a7a8..67af0f70 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt | |||
@@ -1,6 +1,7 @@ | |||
1 | include_directories( | 1 | include_directories( |
2 | ${PROTOCOLS_INCLUDE_DIRS} | 2 | ${PROTOCOLS_INCLUDE_DIRS} |
3 | ${WLC_INCLUDE_DIRS} | 3 | ${WLC_INCLUDE_DIRS} |
4 | ${WLR_INCLUDE_DIRS} | ||
4 | ${PCRE_INCLUDE_DIRS} | 5 | ${PCRE_INCLUDE_DIRS} |
5 | ${JSONC_INCLUDE_DIRS} | 6 | ${JSONC_INCLUDE_DIRS} |
6 | ${XKBCOMMON_INCLUDE_DIRS} | 7 | ${XKBCOMMON_INCLUDE_DIRS} |
@@ -48,6 +49,7 @@ target_link_libraries(sway | |||
48 | sway-protocols | 49 | sway-protocols |
49 | sway-wayland | 50 | sway-wayland |
50 | ${WLC_LIBRARIES} | 51 | ${WLC_LIBRARIES} |
52 | ${WLR_LIBRARIES} | ||
51 | ${XKBCOMMON_LIBRARIES} | 53 | ${XKBCOMMON_LIBRARIES} |
52 | ${PCRE_LIBRARIES} | 54 | ${PCRE_LIBRARIES} |
53 | ${JSONC_LIBRARIES} | 55 | ${JSONC_LIBRARIES} |