From 5e06bb3af484b06c1eebd61d001d7b0ad762abdb Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 14 Oct 2022 15:08:04 +0200
Subject: [PATCH] BUILD: Should fix linking issues with Qt6 libraries + clean
up files
---
CMakeLists.txt | 30 +++++++++++++-----------------
to_install | 2 --
2 files changed, 13 insertions(+), 19 deletions(-)
delete mode 100644 to_install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 164234d7..f90b2390 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,8 +109,8 @@ set(GNU_C_FLAGS
find_library(MPV_LIBRARY mpv REQUIRED) # tested with 0.32.0
find_library(SQLITE3_LIBRARY sqlite3 REQUIRED version>=3.31.0) # tested with 3.34.1
-find_package(CURL COMPONENTS HTTP HTTPS REQUIRED) # tested with 7.74.0
-find_package(Qt6 COMPONENTS Widgets OpenGL REQUIRED)
+find_package(CURL COMPONENTS HTTP HTTPS REQUIRED) # tested with 7.74.0
+find_package(Qt6 COMPONENTS Widgets OpenGL OpenGLWidgets REQUIRED) # tested with 6.4.0-1
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
@@ -270,11 +270,11 @@ add_custom_command(OUTPUT ${SQL_GENERATED_FILE}
COMMENT "Generating SQL included files to embed them"
)
- qt_add_executable(lektord
- MANUAL_FINALIZATION
- ${lektord_SOURCES}
- ${SQL_GENERATED_FILE}
- )
+qt_add_executable(lektord
+ MANUAL_FINALIZATION
+ ${lektord_SOURCES}
+ ${SQL_GENERATED_FILE}
+)
add_executable(lkt ${lkt_SOURCES})
set_property(TARGET lektord PROPERTY CXX_STANDARD 20)
@@ -296,15 +296,6 @@ if(GENERATE_MANPAGES)
endforeach()
endif()
-target_link_libraries(lektord PRIVATE
- ${MPV_LIBRARY}
- ${CMAKE_DL_LIBS}
- ${SQLITE3_LIBRARY}
- ${CURL_LIBRARIES}
- Qt::Widgets
- Qt::OpenGL
-)
-
target_include_directories(lkt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
target_include_directories(lektord PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/inc
@@ -363,8 +354,13 @@ add_dependencies(lektord liblektor_rs)
target_link_libraries(lektord
PRIVATE
"${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/liblektor_rs.a"
+ ${MPV_LIBRARY}
+ ${CMAKE_DL_LIBS}
+ ${SQLITE3_LIBRARY}
+ ${CURL_LIBRARIES}
Qt::Widgets
Qt::OpenGL
+ Qt::OpenGLWidgets
)
### ###
@@ -394,5 +390,5 @@ foreach(CMD IN LISTS MANPAGE_COMMANDS)
)
endforeach()
- qt_finalize_executable(lektord)
+qt_finalize_executable(lektord)
diff --git a/to_install b/to_install
deleted file mode 100644
index f1dc015b..00000000
--- a/to_install
+++ /dev/null
@@ -1,2 +0,0 @@
-qt6-base qt6-declarative qt6-imageformats qt6-location qt6-multimedia qt6-quickcontrols2 qt6-sensors qt6-speech qt6-svg qt6-tools qt6-translations qt6-virtualkeyboard qt6-wayland qt6-webchannel qt6-webengine
-
--
GitLab