release pipeline fixes
tests / package-smoke-linux (push) Skipped
tests / package-smoke-windows (push) Skipped
tests / package-smoke-macos (push) Skipped
tests / windows (pull_request) Skipped
tests / macos (pull_request) Skipped
tests / package-smoke-linux (pull_request) Skipped
tests / package-smoke-windows (pull_request) Skipped
tests / package-smoke-macos (pull_request) Skipped
tests / macos (push) Successful in 1m19s
tests / linux (push) Successful in 5m48s
tests / linux (pull_request) Successful in 5m20s
tests / windows (push) Canceled after 30m5s
tests / package-smoke-linux (push) Skipped
tests / package-smoke-windows (push) Skipped
tests / package-smoke-macos (push) Skipped
tests / windows (pull_request) Skipped
tests / macos (pull_request) Skipped
tests / package-smoke-linux (pull_request) Skipped
tests / package-smoke-windows (pull_request) Skipped
tests / package-smoke-macos (pull_request) Skipped
tests / macos (push) Successful in 1m19s
tests / linux (push) Successful in 5m48s
tests / linux (pull_request) Successful in 5m20s
tests / windows (push) Canceled after 30m5s
Signed-off-by: galeon <dertiellis@gmail.com>
This commit is contained in:
1 parent
4463d4e5da
commit
1817157e4d
9 files changed
+200
-19
No files matched your search
+23
-5
@@ -1,8 +1,27 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
|
||||
project(BiLauncher VERSION 1.0.1 LANGUAGES CXX C)
|
||||
set(LAUNCHER_VERSION_SUFFIX "-dev")
|
||||
set(LAUNCHER_VERSION "${PROJECT_VERSION}${LAUNCHER_VERSION_SUFFIX}")
|
||||
|
||||
# Канал сборки (dev / rc / релиз) не хранится в репозитории, а вычисляется
|
||||
# при сборке — см. cmake/LauncherVersion.cmake. CI передаёт полную версию:
|
||||
# -DLAUNCHER_BUILD_VERSION=1.0.1-rc2.
|
||||
set(LAUNCHER_BUILD_VERSION "" CACHE STRING "Полная версия от CI (X.Y.Z[-rcN]); пусто — по тегу и ветке git")
|
||||
set(LAUNCHER_VERSION_NUMERIC "${PROJECT_VERSION}")
|
||||
set(LAUNCHER_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
|
||||
set(LAUNCHER_GENERATED_DIR "${PROJECT_BINARY_DIR}/generated")
|
||||
set(LAUNCHER_VERSION_HEADER "${LAUNCHER_GENERATED_DIR}/launcherversion.h")
|
||||
include(cmake/LauncherVersion.cmake)
|
||||
message(STATUS "Версия лаунчера: ${LAUNCHER_VERSION} (канал ${LAUNCHER_CHANNEL})")
|
||||
add_custom_target(launcher_version
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
"-DLAUNCHER_VERSION_NUMERIC=${LAUNCHER_VERSION_NUMERIC}"
|
||||
"-DLAUNCHER_SOURCE_DIR=${LAUNCHER_SOURCE_DIR}"
|
||||
"-DLAUNCHER_VERSION_HEADER=${LAUNCHER_VERSION_HEADER}"
|
||||
"-DLAUNCHER_BUILD_VERSION=${LAUNCHER_BUILD_VERSION}"
|
||||
-P "${PROJECT_SOURCE_DIR}/cmake/LauncherVersion.cmake"
|
||||
BYPRODUCTS "${LAUNCHER_VERSION_HEADER}"
|
||||
COMMENT "Версия лаунчера из git"
|
||||
VERBATIM)
|
||||
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(QT_NO_PRIVATE_MODULE_WARNING ON)
|
||||
@@ -146,9 +165,8 @@ target_link_libraries(BiLauncher
|
||||
PRIVATE Qt6::Quick Qt6::QuickControls2 Qt6::Svg Qt6::Core Qt6::CorePrivate Qt6::Gui Qt6::Network
|
||||
)
|
||||
|
||||
target_compile_definitions(BiLauncher PRIVATE
|
||||
LAUNCHER_VERSION="${LAUNCHER_VERSION}"
|
||||
)
|
||||
target_include_directories(BiLauncher PRIVATE "${LAUNCHER_GENERATED_DIR}")
|
||||
add_dependencies(BiLauncher launcher_version)
|
||||
|
||||
if(Qt6WebEngineQuick_FOUND)
|
||||
target_link_libraries(BiLauncher PRIVATE Qt6::WebEngineQuick)
|
||||
|
||||
Reference in new issue
Block a user