From 7213d4850817f8ceb06750c3c8c3fb5554554ea0 Mon Sep 17 00:00:00 2001 From: makepost Date: Fri, 19 Apr 2019 15:12:29 +0000 Subject: [PATCH] Allow build for Wayland w/o X11Extras, if VST off @lukas-w reminds in 134dae8 comments that X11Extras help Linux users of VST effects #3786. Now LMMS builds and runs on Weston without X11 dependencies, though only if WANT_VST is off. --- CMakeLists.txt | 2 +- src/3rdparty/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2611d70867f..e186fa61cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ IF(WANT_QT5) Qt5::Xml ) - IF(LMMS_BUILD_LINUX) + IF(LMMS_BUILD_LINUX AND WANT_VST) FIND_PACKAGE(Qt5X11Extras REQUIRED) LIST(APPEND QT_LIBRARIES Qt5::X11Extras) ENDIF() diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index 5dec2890c45..d546fd06e87 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_C_FLAGS "") set(CMAKE_CXX_FLAGS "") -IF(QT5 AND LMMS_BUILD_LINUX) +IF(QT5 AND LMMS_BUILD_LINUX AND WANT_VST) set(BUILD_SHARED_LIBS OFF) add_subdirectory(qt5-x11embed) ENDIF()