diff options
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f33a3f8..00e8de6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -10,8 +10,6 @@ add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") | |||
10 | list(INSERT CMAKE_MODULE_PATH 0 | 10 | list(INSERT CMAKE_MODULE_PATH 0 |
11 | "${CMAKE_CURRENT_SOURCE_DIR}/CMake") | 11 | "${CMAKE_CURRENT_SOURCE_DIR}/CMake") |
12 | 12 | ||
13 | add_subdirectory(swaybg swaybg) | ||
14 | |||
15 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") | 13 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") |
16 | execute_process( | 14 | execute_process( |
17 | COMMAND git describe --always | 15 | COMMAND git describe --always |
@@ -31,6 +29,10 @@ add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") | |||
31 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) | 29 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) |
32 | add_definitions("-DSWAY_VERSION_DATE=${CURRENT_DATE}") | 30 | add_definitions("-DSWAY_VERSION_DATE=${CURRENT_DATE}") |
33 | 31 | ||
32 | include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") | ||
33 | add_subdirectory(common) | ||
34 | add_subdirectory(swaybg) | ||
35 | |||
34 | find_package(XKBCommon REQUIRED) | 36 | find_package(XKBCommon REQUIRED) |
35 | find_package(WLC REQUIRED) | 37 | find_package(WLC REQUIRED) |
36 | find_package(A2X REQUIRED) | 38 | find_package(A2X REQUIRED) |
@@ -38,14 +40,12 @@ find_package(PCRE REQUIRED) | |||
38 | find_package(JsonC REQUIRED) | 40 | find_package(JsonC REQUIRED) |
39 | 41 | ||
40 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 42 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
41 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) | ||
42 | 43 | ||
43 | include_directories( | 44 | include_directories( |
44 | ${WLC_INCLUDE_DIRS} | 45 | ${WLC_INCLUDE_DIRS} |
45 | ${PCRE_INCLUDE_DIRS} | 46 | ${PCRE_INCLUDE_DIRS} |
46 | ${JSONC_INCLUDE_DIRS} | 47 | ${JSONC_INCLUDE_DIRS} |
47 | ${XKBCOMMON_INCLUDE_DIRS} | 48 | ${XKBCOMMON_INCLUDE_DIRS} |
48 | include/ | ||
49 | ) | 49 | ) |
50 | 50 | ||
51 | add_executable(sway | 51 | add_executable(sway |
@@ -58,6 +58,7 @@ target_link_libraries(sway | |||
58 | ${XKBCOMMON_LIBRARIES} | 58 | ${XKBCOMMON_LIBRARIES} |
59 | ${PCRE_LIBRARIES} | 59 | ${PCRE_LIBRARIES} |
60 | ${JSONC_LIBRARIES} | 60 | ${JSONC_LIBRARIES} |
61 | sway_common | ||
61 | ) | 62 | ) |
62 | 63 | ||
63 | install( | 64 | install( |