Merge branch 'master' into touch-enable-move
This commit is contained in:
commit
364c8ec933
12 changed files with 389 additions and 31 deletions
|
|
@ -70,6 +70,12 @@ pkg_check_modules(LXC lxc REQUIRED)
|
|||
pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
|
||||
pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
|
||||
|
||||
message(STATUS "LXC version: ${LXC_VERSION}")
|
||||
if (${LXC_VERSION} VERSION_LESS 3.0)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LXC2_SUPPORT")
|
||||
message(STATUS "Building with LXC 2.x compatibility support")
|
||||
endif()
|
||||
|
||||
option(ENABLE_WAYLAND "Enable wayland support" ON)
|
||||
if (ENABLE_WAYLAND)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWAYLAND_SUPPORT")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue