diff options
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | common/CMakeLists.txt | 3 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f8dd9cb7..aa103915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -29,10 +29,9 @@ add_definitions("-DSWAY_GIT_VERSION=\"g${GIT_COMMIT_HASH}\"") | |||
29 | add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") | 29 | add_definitions("-DSWAY_GIT_BRANCH=\"${GIT_BRANCH}\"") |
30 | 30 | ||
31 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) | 31 | string(TIMESTAMP CURRENT_DATE "%Y-%m-%d" UTC) |
32 | add_definitions("-DSWAY_VERSION_DATE=${CURRENT_DATE}") | 32 | add_definitions('-DSWAY_VERSION_DATE="${CURRENT_DATE}"') |
33 | 33 | ||
34 | include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") | 34 | include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") |
35 | add_subdirectory(common) | ||
36 | add_subdirectory(swaybg) | 35 | add_subdirectory(swaybg) |
37 | 36 | ||
38 | find_package(XKBCommon REQUIRED) | 37 | find_package(XKBCommon REQUIRED) |
@@ -42,6 +41,7 @@ find_package(PCRE REQUIRED) | |||
42 | find_package(JsonC REQUIRED) | 41 | find_package(JsonC REQUIRED) |
43 | 42 | ||
44 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 43 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
44 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) | ||
45 | 45 | ||
46 | include_directories( | 46 | include_directories( |
47 | ${WLC_INCLUDE_DIRS} | 47 | ${WLC_INCLUDE_DIRS} |
@@ -60,7 +60,6 @@ target_link_libraries(sway | |||
60 | ${XKBCOMMON_LIBRARIES} | 60 | ${XKBCOMMON_LIBRARIES} |
61 | ${PCRE_LIBRARIES} | 61 | ${PCRE_LIBRARIES} |
62 | ${JSONC_LIBRARIES} | 62 | ${JSONC_LIBRARIES} |
63 | sway_common | ||
64 | ) | 63 | ) |
65 | 64 | ||
66 | install( | 65 | install( |
@@ -81,7 +80,7 @@ function (add_manpage name section) | |||
81 | --no-xmllint | 80 | --no-xmllint |
82 | --doctype manpage | 81 | --doctype manpage |
83 | --format manpage | 82 | --format manpage |
84 | -D "${CMAKE_CURRENT_BINARY_DIR}" | 83 | -D "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" |
85 | "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" | 84 | "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" |
86 | DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" | 85 | DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.${section}.txt" |
87 | COMMENT "Generating manpage for ${name}.${section}") | 86 | COMMENT "Generating manpage for ${name}.${section}") |
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt deleted file mode 100644 index f3a00626..00000000 --- a/common/CMakeLists.txt +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | add_library(sway_common STATIC | ||
2 | list.c | ||
3 | log.c) | ||
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 1ad43324..8da31faa 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -14,6 +14,7 @@ include_directories( | |||
14 | ) | 14 | ) |
15 | 15 | ||
16 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 16 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
17 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | ||
17 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 18 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) |
18 | 19 | ||
19 | add_executable(swaybg | 20 | add_executable(swaybg |
@@ -22,7 +23,7 @@ add_executable(swaybg | |||
22 | ${common} | 23 | ${common} |
23 | ) | 24 | ) |
24 | 25 | ||
25 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} sway_common) | 26 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES}) |
26 | 27 | ||
27 | install( | 28 | install( |
28 | TARGETS swaybg | 29 | TARGETS swaybg |