diff options
author | Christoph Gysin <christoph.gysin@gmail.com> | 2015-12-01 21:14:27 +0200 |
---|---|---|
committer | Christoph Gysin <christoph.gysin@gmail.com> | 2015-12-01 22:03:09 +0200 |
commit | 2dedf206d79a3ce9c44c3216a2b148a2172b78fa (patch) | |
tree | 5278f21eac71a2a1049e063eb93d15e8daac03cd | |
parent | cmake: separate C flags and preprocesser definitions (diff) | |
download | sway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.tar.gz sway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.tar.zst sway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.zip |
cmake: use out-of-source build
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | swaybar/CMakeLists.txt | 1 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 1 | ||||
-rw-r--r-- | swaygrab/CMakeLists.txt | 2 | ||||
-rw-r--r-- | swaymsg/CMakeLists.txt | 2 |
6 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51209aea..9aeea48e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -9,8 +9,7 @@ add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') | |||
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_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") |
13 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") | ||
14 | add_definitions( | 13 | add_definitions( |
15 | -D_GNU_SOURCE | 14 | -D_GNU_SOURCE |
16 | ) | 15 | ) |
@@ -46,7 +46,9 @@ Install dependencies: | |||
46 | 46 | ||
47 | Run these commands: | 47 | Run these commands: |
48 | 48 | ||
49 | cmake . | 49 | mkdir build |
50 | cd build | ||
51 | cmake .. | ||
50 | make | 52 | make |
51 | sudo make install | 53 | sudo make install |
52 | 54 | ||
diff --git a/swaybar/CMakeLists.txt b/swaybar/CMakeLists.txt index 1b68fd3e..260d6701 100644 --- a/swaybar/CMakeLists.txt +++ b/swaybar/CMakeLists.txt | |||
@@ -5,7 +5,6 @@ find_package(Cairo REQUIRED) | |||
5 | find_package(Pango REQUIRED) | 5 | find_package(Pango REQUIRED) |
6 | 6 | ||
7 | include(Wayland) | 7 | include(Wayland) |
8 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | ||
9 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell | 8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell |
10 | "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" | 9 | "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" |
11 | xdg-shell | 10 | xdg-shell |
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 9a54a32a..e4b69c18 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -5,7 +5,6 @@ find_package(Cairo REQUIRED) | |||
5 | find_package(Pango REQUIRED) | 5 | find_package(Pango REQUIRED) |
6 | 6 | ||
7 | include(Wayland) | 7 | include(Wayland) |
8 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | ||
9 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell | 8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell |
10 | "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" | 9 | "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" |
11 | xdg-shell | 10 | xdg-shell |
diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index 672a62cd..efe8986b 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt | |||
@@ -1,7 +1,5 @@ | |||
1 | project(swaygrab) | 1 | project(swaygrab) |
2 | 2 | ||
3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | ||
4 | |||
5 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 3 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
6 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 4 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
7 | 5 | ||
diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 9231e9f4..2671dc2c 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt | |||
@@ -1,7 +1,5 @@ | |||
1 | project(swaymsg) | 1 | project(swaymsg) |
2 | 2 | ||
3 | set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) | ||
4 | |||
5 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 3 | file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
6 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | 4 | file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) |
7 | 5 | ||