From b0779c0cb6cb10ef1ad61c77290fe7c71acb1041 Mon Sep 17 00:00:00 2001 From: Marius Gripsgard Date: Thu, 16 Aug 2018 18:29:39 +0200 Subject: [PATCH] Add enable mir option (default disabled) --- CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1a98c5..d046142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,19 +68,18 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED) pkg_check_modules(DBUS dbus-1 REQUIRED) pkg_check_modules(LXC lxc REQUIRED) pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED) +pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED) option(ANBOX_ENABLE_WAYLAND "Enable wayland support" ON) if (ANBOX_ENABLE_WAYLAND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWAYLAND_SUPPORT") endif() -pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED) -# FIXME mir support is currently broken due to mir's API -# being broken with recent landings in Ubuntu 16.04 -# pkg_check_modules(MIRCLIENT mirclient) -# if (MIRCLIENT_FOUND) -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT") -# endif() +option(ANBOX_ENABLE_MIR "Enable mir support" OFF) +if (ANBOX_ENABLE_MIR) + pkg_check_modules(MIRCLIENT mirclient REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT") +endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMESA_EGL_NO_X11_HEADERS")