diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2015-11-12 22:20:44 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-11-12 22:20:44 -0500 |
| commit | 44d0b3282f91cf1f01a9c79ad0e2b64f1a11e845 (patch) | |
| tree | a7797ce637c450643a773d6cb415b7a617d11891 /swaybg | |
| parent | We don't need to implement strdup (diff) | |
| parent | cmake: run git in the source directory (diff) | |
| download | sway-44d0b3282f91cf1f01a9c79ad0e2b64f1a11e845.tar.gz sway-44d0b3282f91cf1f01a9c79ad0e2b64f1a11e845.tar.zst sway-44d0b3282f91cf1f01a9c79ad0e2b64f1a11e845.zip | |
Merge pull request #224 from mathstuf/cmake-cleanups
CMake cleanups
Diffstat (limited to 'swaybg')
| -rw-r--r-- | swaybg/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 9351441a..1ad43324 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
| @@ -7,9 +7,7 @@ find_package(Pango REQUIRED) | |||
| 7 | include(Wayland) | 7 | include(Wayland) |
| 8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) | 8 | WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell) |
| 9 | 9 | ||
| 10 | set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/") | ||
| 11 | include_directories( | 10 | include_directories( |
| 12 | ${CMAKE_CURRENT_SOURCE_DIR}/../include | ||
| 13 | ${WAYLAND_CLIENT_INCLUDE_DIR} | 11 | ${WAYLAND_CLIENT_INCLUDE_DIR} |
| 14 | ${CAIRO_INCLUDE_DIRS} | 12 | ${CAIRO_INCLUDE_DIRS} |
| 15 | ${PANGO_INCLUDE_DIRS} | 13 | ${PANGO_INCLUDE_DIRS} |
| @@ -17,7 +15,6 @@ include_directories( | |||
| 17 | 15 | ||
| 18 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) | 16 | FILE(GLOB sources ${PROJECT_SOURCE_DIR}/*.c) |
| 19 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) | 17 | FILE(GLOB wl_sources ${PROJECT_SOURCE_DIR}/../wayland/*.c) |
| 20 | FILE(GLOB common ${PROJECT_SOURCE_DIR}/../common/*.c) | ||
| 21 | 18 | ||
| 22 | add_executable(swaybg | 19 | add_executable(swaybg |
| 23 | ${sources} | 20 | ${sources} |
| @@ -25,9 +22,9 @@ add_executable(swaybg | |||
| 25 | ${common} | 22 | ${common} |
| 26 | ) | 23 | ) |
| 27 | 24 | ||
| 28 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES}) | 25 | TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} sway_common) |
| 29 | 26 | ||
| 30 | INSTALL( | 27 | install( |
| 31 | TARGETS swaybg | 28 | TARGETS swaybg |
| 32 | RUNTIME DESTINATION bin | 29 | RUNTIME DESTINATION bin |
| 33 | ) | 30 | COMPONENT runtime) |