mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-28 22:23:42 +01:00
Merge pull request #610 from sleep-walker/master
CMake related improvements
This commit is contained in:
commit
17543d3e00
9 changed files with 15 additions and 7 deletions
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1.0)
|
|||
|
||||
project(sway C)
|
||||
|
||||
set(CMAKE_C_FLAGS "-g")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
|
||||
set(CMAKE_C_STANDARD 99)
|
||||
set(CMAKE_C_EXTENSIONS OFF)
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
include_directories(
|
||||
${WLC_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
add_library(sway-common
|
||||
add_library(sway-common STATIC
|
||||
ipc-client.c
|
||||
list.c
|
||||
log.c
|
||||
|
|
|
@ -22,7 +22,7 @@ WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock
|
|||
swaylock
|
||||
)
|
||||
|
||||
add_library(sway-protocols
|
||||
add_library(sway-protocols STATIC
|
||||
${proto-client-xdg-shell}
|
||||
${proto-client-desktop-shell}
|
||||
${proto-server-desktop-shell}
|
||||
|
@ -31,3 +31,4 @@ add_library(sway-protocols
|
|||
)
|
||||
|
||||
set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE)
|
||||
INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS})
|
||||
|
|
|
@ -7,6 +7,7 @@ include_directories(
|
|||
${LIBINPUT_INCLUDE_DIRS}
|
||||
${CAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
${WAYLAND_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_executable(sway
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
include_directories(
|
||||
${PROTOCOLS_INCLUDE_DIRS}
|
||||
${WAYLAND_CLIENT_INCLUDE_DIR}
|
||||
${WAYLAND_INCLUDE_DIR}
|
||||
${CAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
${JSONC_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
add_executable(swaybar
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
include_directories(
|
||||
${PROTOCOLS_INCLUDE_DIRS}
|
||||
${WAYLAND_CLIENT_INCLUDE_DIR}
|
||||
${WAYLAND_INCLUDE_DIR}
|
||||
${CAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
add_executable(swaybg
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
include_directories(
|
||||
${JSONC_INCLUDE_DIRS}
|
||||
${WLC_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
add_executable(swaygrab
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
include_directories(
|
||||
${PROTOCOLS_INCLUDE_DIRS}
|
||||
${WAYLAND_CLIENT_INCLUDE_DIR}
|
||||
${WAYLAND_INCLUDE_DIR}
|
||||
${CAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
${PAM_INCLUDE_DIRS}
|
||||
${JSONC_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
add_executable(swaylock
|
||||
|
|
|
@ -2,9 +2,10 @@ include_directories(
|
|||
${PROTOCOLS_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
${XKBCOMMON_INCLUDE_DIRS}
|
||||
${WAYLAND_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_library(sway-wayland
|
||||
add_library(sway-wayland STATIC
|
||||
buffers.c
|
||||
pango.c
|
||||
registry.c
|
||||
|
|
Loading…
Reference in a new issue