diff options
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | swaybar/CMakeLists.txt | 8 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 8 | ||||
-rw-r--r-- | swaygrab/CMakeLists.txt | 6 | ||||
-rw-r--r-- | swaymsg/CMakeLists.txt | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 68dd7fa3..c022d87d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -8,7 +8,7 @@ add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') | |||
8 | 8 | ||
9 | set(CMAKE_C_FLAGS "-g") | 9 | set(CMAKE_C_FLAGS "-g") |
10 | set(CMAKE_C_STANDARD 99) | 10 | set(CMAKE_C_STANDARD 99) |
11 | SET(CMAKE_C_EXTENSIONS OFF) | 11 | set(CMAKE_C_EXTENSIONS OFF) |
12 | set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") | 12 | set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") |
13 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") | 13 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") |
14 | add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") | 14 | add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") |
@@ -50,8 +50,8 @@ find_package(PCRE REQUIRED) | |||
50 | find_package(Wayland REQUIRED) | 50 | find_package(Wayland REQUIRED) |
51 | find_package(JsonC REQUIRED) | 51 | find_package(JsonC REQUIRED) |
52 | 52 | ||
53 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) | 53 | file(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) |
54 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) | 54 | file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) |
55 | 55 | ||
56 | include(Wayland) | 56 | include(Wayland) |
57 | WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" desktop-shell) | 57 | WAYLAND_ADD_PROTOCOL_SERVER(proto-desktop-shell "${PROJECT_SOURCE_DIR}/protocols/desktop-shell.xml" desktop-shell) |
diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 12dd40c6..80b8876d 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt | |||
@@ -16,9 +16,9 @@ include_directories( | |||
16 | ${CMAKE_CURRENT_BINARY_DIR} | 16 | ${CMAKE_CURRENT_BINARY_DIR} |
17 | ) | 17 | ) |
18 | 18 | ||
19 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 19 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
20 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 20 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
21 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 21 | file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) |
22 | 22 | ||
23 | add_executable(swaybar | 23 | add_executable(swaybar |
24 | ${sources} | 24 | ${sources} |
@@ -28,7 +28,7 @@ add_executable(swaybar | |||
28 | ${proto-desktop-shell} | 28 | ${proto-desktop-shell} |
29 | ) | 29 | ) |
30 | 30 | ||
31 | TARGET_LINK_LIBRARIES(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) | 31 | target_link_libraries(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) |
32 | 32 | ||
33 | install( | 33 | install( |
34 | TARGETS swaybar | 34 | TARGETS swaybar |
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index d4de69de..6a6c3efa 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -16,9 +16,9 @@ include_directories( | |||
16 | ${CMAKE_CURRENT_BINARY_DIR} | 16 | ${CMAKE_CURRENT_BINARY_DIR} |
17 | ) | 17 | ) |
18 | 18 | ||
19 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 19 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
20 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 20 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
21 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 21 | file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) |
22 | 22 | ||
23 | add_executable(swaybg | 23 | add_executable(swaybg |
24 | ${sources} | 24 | ${sources} |
@@ -28,7 +28,7 @@ add_executable(swaybg | |||
28 | ${proto-desktop-shell} | 28 | ${proto-desktop-shell} |
29 | ) | 29 | ) |
30 | 30 | ||
31 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) | 31 | target_link_libraries(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) |
32 | 32 | ||
33 | install( | 33 | install( |
34 | TARGETS swaybg | 34 | TARGETS swaybg |
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 8bc8ed8b..3901d91c 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt | |||
@@ -2,15 +2,15 @@ project(swaygrab) | |||
2 | 2 | ||
3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | 3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) |
4 | 4 | ||
5 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 5 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
6 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 6 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
7 | 7 | ||
8 | add_executable(swaygrab | 8 | add_executable(swaygrab |
9 | ${sources} | 9 | ${sources} |
10 | ${common} | 10 | ${common} |
11 | ) | 11 | ) |
12 | 12 | ||
13 | TARGET_LINK_LIBRARIES(swaygrab rt) | 13 | target_link_libraries(swaygrab rt) |
14 | 14 | ||
15 | install( | 15 | install( |
16 | TARGETS swaygrab | 16 | TARGETS swaygrab |
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 79af0f3e..2dcdfede 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt | |||
@@ -2,8 +2,8 @@ project(swaymsg) | |||
2 | 2 | ||
3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | 3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) |
4 | 4 | ||
5 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 5 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
6 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 6 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
7 | 7 | ||
8 | add_executable(swaymsg | 8 | add_executable(swaymsg |
9 | ${sources} | 9 | ${sources} |