Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 5e06bb3a rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Should fix linking issues with Qt6 libraries + clean up files

parent ce6c45d2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!198Migrate from Qt5 to Qt6
Pipeline #3315 en échec
......@@ -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)
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
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter