diff options
author | Ben Boeckel <mathstuf@gmail.com> | 2015-11-12 21:42:37 -0500 |
---|---|---|
committer | Ben Boeckel <mathstuf@gmail.com> | 2015-11-12 21:56:14 -0500 |
commit | ec013d1f1a5e0345353009f97dc506420995db6b (patch) | |
tree | 8ce960a4592d2889e4ed4ed307bdbdcbfd7c3e36 | |
parent | cmake: clean up installation rules (diff) | |
download | sway-ec013d1f1a5e0345353009f97dc506420995db6b.tar.gz sway-ec013d1f1a5e0345353009f97dc506420995db6b.tar.zst sway-ec013d1f1a5e0345353009f97dc506420995db6b.zip |
common: create a static library
-rw-r--r-- | CMakeLists.txt | 9 | ||||
-rw-r--r-- | common/CMakeLists.txt | 3 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 4 |
3 files changed, 9 insertions, 7 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( |
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt new file mode 100644 index 00000000..f3a00626 --- /dev/null +++ b/common/CMakeLists.txt | |||
@@ -0,0 +1,3 @@ | |||
1 | add_library(sway_common STATIC | ||
2 | list.c | ||
3 | log.c) | ||
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index e86cf656..1ad43324 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -8,7 +8,6 @@ include(Wayland) | |||
8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) | 8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) |
9 | 9 | ||
10 | include_directories( | 10 | include_directories( |
11 | ${CMAKE_CURRENT_SOURCE_DIR}/../include | ||
12 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 11 | ${WAYLAND_CLIENT_INCLUDE_DIR} |
13 | ${CAIRO_INCLUDE_DIRS} | 12 | ${CAIRO_INCLUDE_DIRS} |
14 | ${PANGO_INCLUDE_DIRS} | 13 | ${PANGO_INCLUDE_DIRS} |
@@ -16,7 +15,6 @@ include_directories( | |||
16 | 15 | ||
17 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 16 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
18 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 17 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) |
19 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | ||
20 | 18 | ||
21 | add_executable(swaybg | 19 | add_executable(swaybg |
22 | ${sources} | 20 | ${sources} |
@@ -24,7 +22,7 @@ add_executable(swaybg | |||
24 | ${common} | 22 | ${common} |
25 | ) | 23 | ) |
26 | 24 | ||
27 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES}) | 25 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} sway_common) |
28 | 26 | ||
29 | install( | 27 | install( |
30 | TARGETS swaybg | 28 | TARGETS swaybg |