Add branch support for updates

This commit is contained in:
woblight
2024-08-12 12:13:38 +02:00
parent d0de2533a7
commit c41e67dc14
3 changed files with 25 additions and 20 deletions
+16 -15
View File
@@ -1,8 +1,9 @@
cmake_minimum_required(VERSION 3.1.0)
project(GitAddonsManager LANGUAGES CXX)
find_package(Qt6 COMPONENTS Quick Core QuickControls2 Concurrent Network Widgets REQUIRED)
find_package(Qt6 COMPONENTS Quick Gui Core QuickControls2 Concurrent Network Widgets REQUIRED)
find_package(Qt6LinguistTools)
find_package(QuaZip-Qt6)
if (NOT WIN32)
find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBGIT2 REQUIRED IMPORTED_TARGET libgit2)
@@ -38,9 +39,13 @@ set(qml_files
Update.qml
)
set(${PROJECT_NAME}_BUILD_NAME "" CACHE STRING "name of the build pipeline for self updates")
set(${PROJECT_NAME}_BRANCH_NAME "" CACHE STRING "name of the branch for self updates")
qt_add_executable(GitAddonsManager
addon.h control.h utils.h
main.cpp addon.cpp control.cpp
addon.h control.h remote.h utils.h
main.cpp addon.cpp control.cpp remote.cpp
CI.mk .gitlab-ci.yml
${RESOURCES}
MANUAL_FINALIZATION
@@ -51,11 +56,18 @@ set_property(TARGET GitAddonsManager PROPERTY CXX_STANDARD 20)
add_compile_definitions(
GIT_DESCRIBE="${GIT_DESCRIBE}"
GAM_EXEC="GitAddonsManager${CMAKE_EXECUTABLE_SUFFIX}"
GAM_BUILD_NAME="${GAM_BUILD_NAME}"
)
if (NOT ${PROJECT_NAME}_BUILD_NAME STREQUAL "")
add_compile_definitions(GAM_BUILD_NAME="${${PROJECT_NAME}_BUILD_NAME}")
endif()
if (NOT ${PROJECT_NAME}_BRANCH_NAME STREQUAL "")
add_compile_definitions(GAM_BRANCH_NAME="${${PROJECT_NAME}_BRANCH_NAME}")
endif()
target_link_libraries(GitAddonsManager PUBLIC Qt6::Core)
target_link_libraries(GitAddonsManager PUBLIC Qt6::Quick)
target_link_libraries(GitAddonsManager PUBLIC Qt6::Gui)
target_link_libraries(GitAddonsManager PUBLIC Qt6::QuickControls2)
target_link_libraries(GitAddonsManager PUBLIC Qt6::Concurrent)
target_link_libraries(GitAddonsManager PUBLIC Qt6::Network)
@@ -68,17 +80,6 @@ else()
endif()
# qt6_add_qml_module(GitAddonsManager
# URI raffarti.GitAddonsManager
# VERSION 1.0
# SOURCES
# sound.cpp sound.h
# QML_FILES
# main.qml
# Sounds.qml
# Sound.qml
# # ENABLE_TYPE_COMPILER
# )
target_link_libraries(GitAddonsManager PRIVATE Qt6::QmlPrivate Qt6::QuickPrivate)
set(APPNAME GitAddonsManager)