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}\"') set(CMAKE_C_FLAGS "-g") set(CMAKE_C_STANDARD 99) -SET(CMAKE_C_EXTENSIONS OFF) +set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_definitions("-Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE") @@ -50,8 +50,8 @@ find_package(PCRE REQUIRED) find_package(Wayland REQUIRED) find_package(JsonC REQUIRED) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/common/*.c) include(Wayland) 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( ${CMAKE_CURRENT_BINARY_DIR} ) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) -FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) add_executable(swaybar ${sources} @@ -28,7 +28,7 @@ add_executable(swaybar ${proto-desktop-shell} ) -TARGET_LINK_LIBRARIES(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +target_link_libraries(swaybar ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) install( 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( ${CMAKE_CURRENT_BINARY_DIR} ) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) -FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) add_executable(swaybg ${sources} @@ -28,7 +28,7 @@ add_executable(swaybg ${proto-desktop-shell} ) -TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) +target_link_libraries(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) install( 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) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaygrab ${sources} ${common} ) -TARGET_LINK_LIBRARIES(swaygrab rt) +target_link_libraries(swaygrab rt) install( 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) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) -FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) -FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) +file(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) +file(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) add_executable(swaymsg ${sources} |