predrelease changes

This commit is contained in:
galeon committed 2026-10-04 22:19:20 +03:00
1 parent c11da87908
commit 1b18cf48bb
2 files changed
+23 -7

No files matched your search

+17 -6
View File
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(BiLauncher VERSION 0.1 LANGUAGES CXX C) project(BiLauncher VERSION 1.0.0 LANGUAGES CXX C)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(QT_NO_PRIVATE_MODULE_WARNING ON) set(QT_NO_PRIVATE_MODULE_WARNING ON)
find_package(Qt6 REQUIRED COMPONENTS Quick QuickControls2 Core CorePrivate Gui Network) find_package(Qt6 REQUIRED COMPONENTS Quick QuickControls2 Qml Svg Core CorePrivate Gui Network)
find_package(Qt6 QUIET COMPONENTS WebEngineQuick) find_package(Qt6 QUIET COMPONENTS WebEngineQuick)
if(Qt6WebEngineQuick_FOUND) if(Qt6WebEngineQuick_FOUND)
message(STATUS "Qt WebEngine найден: вход через аккаунт Microsoft будет доступен") message(STATUS "Qt WebEngine найден: вход через аккаунт Microsoft будет доступен")
@@ -134,7 +134,7 @@ qt_add_qml_module(BiLauncher
set_target_properties(BiLauncher PROPERTIES set_target_properties(BiLauncher PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER com.galeondev.BiLauncher MACOSX_BUNDLE_GUI_IDENTIFIER com.galeondev.BiLauncher
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
# Попадает в CFBundleIconFile сгенерированного Info.plist — только имя # Попадает в CFBundleIconFile сгенерированного Info.plist — только имя
# файла, без пути: сам .icns кладётся в Contents/Resources выше. # файла, без пути: сам .icns кладётся в Contents/Resources выше.
MACOSX_BUNDLE_ICON_FILE icon.icns MACOSX_BUNDLE_ICON_FILE icon.icns
@@ -143,7 +143,11 @@ set_target_properties(BiLauncher PROPERTIES
) )
target_link_libraries(BiLauncher target_link_libraries(BiLauncher
PRIVATE Qt6::Quick Qt6::QuickControls2 Qt6::Core Qt6::CorePrivate Qt6::Gui Qt6::Network PRIVATE Qt6::Quick Qt6::QuickControls2 Qt6::Svg Qt6::Core Qt6::CorePrivate Qt6::Gui Qt6::Network
)
target_compile_definitions(BiLauncher PRIVATE
LAUNCHER_VERSION="${PROJECT_VERSION}"
) )
if(Qt6WebEngineQuick_FOUND) if(Qt6WebEngineQuick_FOUND)
@@ -205,15 +209,22 @@ if(UNIX AND NOT APPLE)
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
endif() endif()
if(NOT APPLE)
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
"${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md"
"${CMAKE_CURRENT_SOURCE_DIR}/packaging/THIRD_PARTY_LICENSES.txt"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/doc/BiLauncher")
endif()
install(TARGETS BiLauncher install(TARGETS BiLauncher
BUNDLE DESTINATION . BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
find_package(Qt6 REQUIRED COMPONENTS Qml)
set(deploy_opts "") set(deploy_opts "")
if(APPLE) if(APPLE)
set(deploy_opts --hardened-runtime) set(deploy_opts -hardened-runtime)
endif() endif()
qt_generate_deploy_qml_app_script( qt_generate_deploy_qml_app_script(
TARGET BiLauncher TARGET BiLauncher
+6 -1
View File
@@ -15,7 +15,12 @@ int main(int argc, char *argv[])
QtWebEngineQuick::initialize(); QtWebEngineQuick::initialize();
#endif #endif
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QCoreApplication::setApplicationName(QStringLiteral("BiLauncher"));
QCoreApplication::setApplicationVersion(QStringLiteral(LAUNCHER_VERSION));
QCoreApplication::setOrganizationName(QStringLiteral("GaleonDev"));
QCoreApplication::setOrganizationDomain(QStringLiteral("galeonworx.com"));
#ifndef Q_OS_MACOS #ifndef Q_OS_MACOS
QIcon appIcon; QIcon appIcon;