aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 21:14:27 +0200
committerLibravatar Christoph Gysin <christoph.gysin@gmail.com>2015-12-01 22:03:09 +0200
commit2dedf206d79a3ce9c44c3216a2b148a2172b78fa (patch)
tree5278f21eac71a2a1049e063eb93d15e8daac03cd
parentcmake: separate C flags and preprocesser definitions (diff)
downloadsway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.tar.gz
sway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.tar.zst
sway-2dedf206d79a3ce9c44c3216a2b148a2172b78fa.zip
cmake: use out-of-source build
-rw-r--r--CMakeLists.txt3
-rw-r--r--README.md4
-rw-r--r--swaybar/CMakeLists.txt1
-rw-r--r--swaybg/CMakeLists.txt1
-rw-r--r--swaygrab/CMakeLists.txt2
-rw-r--r--swaymsg/CMakeLists.txt2
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}\"')
9set(CMAKE_C_FLAGS "-g") 9set(CMAKE_C_FLAGS "-g")
10set(CMAKE_C_STANDARD 99) 10set(CMAKE_C_STANDARD 99)
11set(CMAKE_C_EXTENSIONS OFF) 11set(CMAKE_C_EXTENSIONS OFF)
12set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") 12set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
13set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
14add_definitions( 13add_definitions(
15 -D_GNU_SOURCE 14 -D_GNU_SOURCE
16) 15)
diff --git a/README.md b/README.md
index 4bbfa750..394dfc80 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,9 @@ Install dependencies:
46 46
47Run these commands: 47Run 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)
5find_package(Pango REQUIRED) 5find_package(Pango REQUIRED)
6 6
7include(Wayland) 7include(Wayland)
8set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/)
9WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 8WAYLAND_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)
5find_package(Pango REQUIRED) 5find_package(Pango REQUIRED)
6 6
7include(Wayland) 7include(Wayland)
8set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/)
9WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell 8WAYLAND_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 @@
1project(swaygrab) 1project(swaygrab)
2 2
3set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/)
4
5file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) 3file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
6file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) 4file(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 @@
1project(swaymsg) 1project(swaymsg)
2 2
3set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/)
4
5file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) 3file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c)
6file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) 4file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c)
7 5