diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-08-26 08:32:27 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-08-26 08:32:27 -0400 |
commit | 93482312f9ce89075ea9d5e314b5217622894e92 (patch) | |
tree | ec34c26914c4dcfda6605c49c93ef40c3e3b830f | |
parent | Do not pass modifiers when getting keysyms from wlc (diff) | |
download | sway-93482312f9ce89075ea9d5e314b5217622894e92.tar.gz sway-93482312f9ce89075ea9d5e314b5217622894e92.tar.zst sway-93482312f9ce89075ea9d5e314b5217622894e92.zip |
Add dependency on PCRE
Perl-compatible regular expression library
-rw-r--r-- | CMake/FindPCRE.cmake | 37 | ||||
-rw-r--r-- | CMakeLists.txt | 12 |
2 files changed, 40 insertions, 9 deletions
diff --git a/CMake/FindPCRE.cmake b/CMake/FindPCRE.cmake new file mode 100644 index 00000000..dbbd60ad --- /dev/null +++ b/CMake/FindPCRE.cmake | |||
@@ -0,0 +1,37 @@ | |||
1 | # Copyright (C) 2007-2009 LuaDist. | ||
2 | # Created by Peter Kapec <kapecp@gmail.com> | ||
3 | # Redistribution and use of this file is allowed according to the terms of the MIT license. | ||
4 | # For details see the COPYRIGHT file distributed with LuaDist. | ||
5 | # Note: | ||
6 | # Searching headers and libraries is very simple and is NOT as powerful as scripts | ||
7 | # distributed with CMake, because LuaDist defines directories to search for. | ||
8 | # Everyone is encouraged to contact the author with improvements. Maybe this file | ||
9 | # becomes part of CMake distribution sometimes. | ||
10 | |||
11 | # - Find pcre | ||
12 | # Find the native PCRE headers and libraries. | ||
13 | # | ||
14 | # PCRE_INCLUDE_DIRS - where to find pcre.h, etc. | ||
15 | # PCRE_LIBRARIES - List of libraries when using pcre. | ||
16 | # PCRE_FOUND - True if pcre found. | ||
17 | |||
18 | # Look for the header file. | ||
19 | FIND_PATH(PCRE_INCLUDE_DIR NAMES pcre.h) | ||
20 | |||
21 | # Look for the library. | ||
22 | FIND_LIBRARY(PCRE_LIBRARY NAMES pcre) | ||
23 | |||
24 | # Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE. | ||
25 | INCLUDE(FindPackageHandleStandardArgs) | ||
26 | FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR) | ||
27 | |||
28 | # Copy the results to the output variables. | ||
29 | IF(PCRE_FOUND) | ||
30 | SET(PCRE_LIBRARIES ${PCRE_LIBRARY}) | ||
31 | SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR}) | ||
32 | ELSE(PCRE_FOUND) | ||
33 | SET(PCRE_LIBRARIES) | ||
34 | SET(PCRE_INCLUDE_DIRS) | ||
35 | ENDIF(PCRE_FOUND) | ||
36 | |||
37 | MARK_AS_ADVANCED(PCRE_INCLUDE_DIRS PCRE_LIBRARIES) | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index b0a64053..7e400cd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -9,19 +9,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake) | |||
9 | find_package(XKBCommon REQUIRED) | 9 | find_package(XKBCommon REQUIRED) |
10 | find_package(WLC REQUIRED) | 10 | find_package(WLC REQUIRED) |
11 | find_package(A2X REQUIRED) | 11 | find_package(A2X REQUIRED) |
12 | 12 | find_package(PCRE REQUIRED) | |
13 | if (UNIX) | ||
14 | find_library(DL_LIBRARY dl) | ||
15 | mark_as_advanced(DL_LIBRARY) | ||
16 | if (NOT DL_LIBRARY) | ||
17 | message(FATAL_ERROR "libdl is needed on unix systems") | ||
18 | endif () | ||
19 | endif (UNIX) | ||
20 | 13 | ||
21 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 14 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
22 | 15 | ||
23 | include_directories( | 16 | include_directories( |
24 | ${WLC_INCLUDE_DIRS} | 17 | ${WLC_INCLUDE_DIRS} |
18 | ${PCRE_INCLUDE_DIRS} | ||
25 | include/ | 19 | include/ |
26 | ) | 20 | ) |
27 | 21 | ||
@@ -32,7 +26,7 @@ add_executable(sway | |||
32 | target_link_libraries(sway | 26 | target_link_libraries(sway |
33 | ${WLC_LIBRARIES} | 27 | ${WLC_LIBRARIES} |
34 | ${XKBCOMMON_LIBRARIES} | 28 | ${XKBCOMMON_LIBRARIES} |
35 | ${DL_LIBRARY} | 29 | ${PCRE_LIBRARIES} |
36 | ) | 30 | ) |
37 | 31 | ||
38 | INSTALL( | 32 | INSTALL( |