jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #327 from morphis/f/disable-mir-support

Browse source 
Disable mir support as it is broken with latest landings in Ubuntu 16.04
This commit is contained in:
Simon Fels 2017-06-19 22:16:31 +02:00 • committed by GitHub
commit fd44f1b53e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -69,10 +69,12 @@ pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
pkg_check_modules(DBUS dbus-1 REQUIRED) pkg_check_modules(DBUS dbus-1 REQUIRED)
pkg_check_modules(LXC lxc REQUIRED) pkg_check_modules(LXC lxc REQUIRED)
pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED) pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
pkg_check_modules(MIRCLIENT mirclient) # FIXME mir support is currently broken due to mir's API
if (MIRCLIENT_FOUND) # being broken with recent landings in Ubuntu 16.04
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT") # pkg_check_modules(MIRCLIENT mirclient)
endif() # if (MIRCLIENT_FOUND)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT")
# endif()
##################################################################### #####################################################################
# Enable code coverage calculation with gcov/gcovr/lcov # Enable code coverage calculation with gcov/gcovr/lcov