Skip to content

Commit 128b462

Browse files
Build - use Qt5::<lib> targets for Qt 5.12 compatibility
Required for Ubuntu 20.04 support. This should probably be reverted when we drop support for Ubuntu 20.04 (the current LTS 22.04 does not need this).
1 parent cc686b7 commit 128b462

File tree

2 files changed

+43
-18
lines changed

2 files changed

+43
-18
lines changed

app/gui/qt/CMakeLists.txt

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -288,24 +288,39 @@ target_link_libraries(${APP_NAME}
288288
PRIVATE
289289
SonicPi::API
290290
QScintilla
291-
Qt::Core
292-
Qt::Gui
293-
Qt::Widgets
294-
Qt::OpenGL
295-
Qt::Concurrent
296-
Qt::Network
297291
Threads::Threads)
298292

299-
if(Qt6_FOUND)
293+
if(Qt5_FOUND)
300294
target_link_libraries(${APP_NAME}
301295
PRIVATE
296+
Qt5::Core
297+
Qt5::Gui
298+
Qt5::Widgets
299+
Qt5::OpenGL
300+
Qt5::Concurrent
301+
Qt5::Network)
302+
else()
303+
target_link_libraries(${APP_NAME}
304+
PRIVATE
305+
Qt::Core
306+
Qt::Gui
307+
Qt::Widgets
308+
Qt::OpenGL
309+
Qt::Concurrent
310+
Qt::Network
302311
Qt::OpenGLWidgets)
303312
endif()
304313

305314
if(WITH_QT_GUI_WEBENGINE)
306-
target_link_libraries(${APP_NAME}
307-
PRIVATE
308-
Qt::WebEngineWidgets)
315+
if(Qt5_FOUND)
316+
target_link_libraries(${APP_NAME}
317+
PRIVATE
318+
Qt5::WebEngineWidgets)
319+
else()
320+
target_link_libraries(${APP_NAME}
321+
PRIVATE
322+
Qt::WebEngineWidgets)
323+
endif()
309324
endif()
310325

311326

app/gui/qt/QScintilla_src-2.13.3/CMakeLists.txt

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,23 @@ target_include_directories(QScintilla
290290
src
291291
)
292292

293-
target_link_libraries(QScintilla
294-
PUBLIC
295-
Qt::PrintSupport
296-
Qt::Widgets
297-
Qt::OpenGL
298-
Qt::Xml
299-
)
293+
if(Qt5_FOUND)
294+
target_link_libraries(QScintilla
295+
PUBLIC
296+
Qt5::PrintSupport
297+
Qt5::Widgets
298+
Qt5::OpenGL
299+
Qt5::Xml
300+
)
301+
else()
302+
target_link_libraries(QScintilla
303+
PUBLIC
304+
Qt::PrintSupport
305+
Qt::Widgets
306+
Qt::OpenGL
307+
Qt::Xml
308+
)
309+
endif()
300310

301311
target_compile_definitions(QScintilla PRIVATE -DSCINTILLA_QT)
302312
target_compile_definitions(QScintilla PRIVATE -DSCI_LEXER)
@@ -324,7 +334,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) # macOS
324334
find_package(Qt5 COMPONENTS MacExtras REQUIRED)
325335
target_link_libraries(QScintilla
326336
PUBLIC
327-
Qt::MacExtras
337+
Qt5::MacExtras
328338
)
329339
endif()
330340

0 commit comments

Comments
 (0)