Skip to content

Commit

Permalink
VstEmbed: Add missing find_package instruction for Qt5X11Extras
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukas-w
lukas-w committed Nov 6, 2017
1 parent 415316f commit 134dae8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ IF(WANT_QT5)
Qt5::Xml
)

IF(LMMS_BUILD_LINUX)
FIND_PACKAGE(Qt5X11Extras REQUIRED)

This comment has been minimized.

Sign in to view

Copy link
@nykula

nykula Apr 9, 2019 •
edited
Loading

Contributor

Could you please remind the context for Qt5X11Extras requirement addition? What issue did it fix and why check for Linux instead of maybe adding an opt-out build flag like WANT_X11? Build on a Wayland-only system succeeded without this check.

UPD: Oh, also had to disable add_subdirectory(qt5-x11embed) in src/3rdparty/CMakeLists.txt. Since these seem only required for VST support, will probably add AND WANT_VST checks to both conditions and send a pull request. Still I'd appreciate context links to better understand the requirement.

This comment has been minimized.

Sign in to view

Copy link
@lukas-w

lukas-w Apr 12, 2019

Author Member

@makepost I believe you're right, this is looks like an oversight. Adding AND WANT_VST should fix it. PR welcome! 👍

Qt5X11Extras is needed for VST embedding. We currently don't support VST embedding on Wayland, and I'm not sure if VSTs will build at all on Linux without QtX11Extras.
LIST(APPEND QT_LIBRARIES Qt5::X11Extras)
ENDIF()

FIND_PACKAGE(Qt5Test)
SET(QT_QTTEST_LIBRARY Qt5::Test)
ELSE()
Expand Down

0 comments on commit 134dae8

Please sign in to comment.