alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #610 from sleep-walker/master

Browse source 
CMake related improvements
This commit is contained in:
Drew DeVault 2016-04-28 14:37:35 -04:00
parent 89af3f78b2 1124e78dda
commit 17543d3e00
9 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0)
project(sway C) project(sway C)
set(CMAKE_C_FLAGS "-g") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_C_EXTENSIONS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

3
common/CMakeLists.txt
View file

@ -1,8 +1,9 @@
include_directories( include_directories(
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_library(sway-common add_library(sway-common STATIC
ipc-client.c ipc-client.c
list.c list.c
log.c log.c

3
protocols/CMakeLists.txt
View file

@ -22,7 +22,7 @@ WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock
swaylock swaylock
) )
add_library(sway-protocols add_library(sway-protocols STATIC
${proto-client-xdg-shell} ${proto-client-xdg-shell}
${proto-client-desktop-shell} ${proto-client-desktop-shell}
${proto-server-desktop-shell} ${proto-server-desktop-shell}
@ -31,3 +31,4 @@ add_library(sway-protocols
) )
set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE) set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE)
INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS})

1
sway/CMakeLists.txt
View file

@ -7,6 +7,7 @@ include_directories(
${LIBINPUT_INCLUDE_DIRS} ${LIBINPUT_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${WAYLAND_INCLUDE_DIR}
) )
add_executable(sway add_executable(sway

3
swaybar/CMakeLists.txt
View file

@ -1,9 +1,10 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaybar add_executable(swaybar

3
swaybg/CMakeLists.txt
View file

@ -1,8 +1,9 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaybg add_executable(swaybg

1
swaygrab/CMakeLists.txt
View file

@ -1,6 +1,7 @@
include_directories( include_directories(
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${WLC_INCLUDE_DIRS} ${WLC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaygrab add_executable(swaygrab

3
swaylock/CMakeLists.txt
View file

@ -1,10 +1,11 @@
include_directories( include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${WAYLAND_CLIENT_INCLUDE_DIR} ${WAYLAND_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${PAM_INCLUDE_DIRS} ${PAM_INCLUDE_DIRS}
${JSONC_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS}
) )
add_executable(swaylock add_executable(swaylock

3
wayland/CMakeLists.txt
View file

@ -2,9 +2,10 @@ include_directories(
${PROTOCOLS_INCLUDE_DIRS} ${PROTOCOLS_INCLUDE_DIRS}
${PANGO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS}
${XKBCOMMON_INCLUDE_DIRS} ${XKBCOMMON_INCLUDE_DIRS}
${WAYLAND_INCLUDE_DIR}
) )
add_library(sway-wayland add_library(sway-wayland STATIC
buffers.c buffers.c
pango.c pango.c
registry.c registry.c