From 579909a36857575ee23a39abc82d4e3b34096385 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 31 May 2017 15:43:13 -0400 Subject: [PATCH] Promote types to a standalone subproject --- CMakeLists.txt | 2 +- backend/CMakeLists.txt | 2 +- {wayland => types}/CMakeLists.txt | 6 +++--- {wayland/types => types}/wlr_output.c | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename {wayland => types}/CMakeLists.txt (59%) rename {wayland/types => types}/wlr_output.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 616a89115..efb741dfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ include_directories(include) add_subdirectory(backend) add_subdirectory(common) -add_subdirectory(wayland) +add_subdirectory(types) add_subdirectory(session) add_subdirectory(example) diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index fc1793cfb..ef612639f 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(wlr-backend target_link_libraries(wlr-backend wlr-common - wlr-wayland + wlr-types ${WAYLAND_LIBRARIES} ${DRM_LIBRARIES} ${GBM_LIBRARIES} diff --git a/wayland/CMakeLists.txt b/types/CMakeLists.txt similarity index 59% rename from wayland/CMakeLists.txt rename to types/CMakeLists.txt index 675a7bd29..eba92cc0a 100644 --- a/wayland/CMakeLists.txt +++ b/types/CMakeLists.txt @@ -3,11 +3,11 @@ include_directories( ${WAYLAND_INCLUDE_DIR} ) -add_library(wlr-wayland - types/wlr_output.c +add_library(wlr-types + wlr_output.c ) -target_link_libraries(wlr-wayland +target_link_libraries(wlr-types wlr-common ${WAYLAND_LIBRARIES} ) diff --git a/wayland/types/wlr_output.c b/types/wlr_output.c similarity index 100% rename from wayland/types/wlr_output.c rename to types/wlr_output.c