From 9391171713701490a24e720472c25b9234f7ff66 Mon Sep 17 00:00:00 2001 From: momen Date: Sun, 22 Jun 2025 10:33:14 +0800 Subject: [PATCH] =?UTF-8?q?chore:cmakelist.txt=E4=BD=BF=E7=94=A8qt5,?= =?UTF-8?q?=E4=BB=A5=E6=AD=A4=E6=9D=A5=E6=94=AF=E6=8C=81=E6=97=A7=E7=89=88?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 75 +++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c624b4..49a4d5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,58 +9,44 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network Concurrent) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network Concurrent) +find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent) + + +find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent Core Gui) + +# 定义所有项目源文件,现在无需条件判断 set(PROJECT_SOURCES - src/main.cpp - src/mainwindow.cpp - src/mainwindow.h - src/mainwindow.ui + src/main.cpp + src/mainwindow.cpp + src/mainwindow.h + src/mainwindow.ui + src/aptssupdater.h src/aptssupdater.cpp + src/icons.qrc + src/appdelegate.h src/appdelegate.cpp + src/applistmodel.h src/applistmodel.cpp + src/downloadmanager.h src/downloadmanager.cpp ) -if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - qt_add_executable(spark-update-tool - MANUAL_FINALIZATION - ${PROJECT_SOURCES} - src/aptssupdater.h src/aptssupdater.cpp - src/icons.qrc - src/appdelegate.h src/appdelegate.cpp - src/applistmodel.h src/applistmodel.cpp - src/downloadmanager.h src/downloadmanager.cpp - ) -# Define target properties for Android with Qt 6 as: -# set_property(TARGET spark-update-tool APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR -# ${CMAKE_CURRENT_SOURCE_DIR}/android) -# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation -else() - if(ANDROID) - add_library(spark-update-tool SHARED - ${PROJECT_SOURCES} - ) -# Define properties for Android with Qt 5 after find_package() calls as: -# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") - else() - add_executable(spark-update-tool - ${PROJECT_SOURCES} - ) - endif() -endif() -target_link_libraries(spark-update-tool PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Concurrent) +add_executable(spark-update-tool + ${PROJECT_SOURCES} +) + +target_link_libraries(spark-update-tool PRIVATE + Qt5::Widgets + Qt5::Network + Qt5::Concurrent + Qt5::Core + Qt5::Gui +) + -# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. -# If you are developing for iOS or macOS you should consider setting an -# explicit, fixed bundle identifier manually though. -if(${QT_VERSION} VERSION_LESS 6.1.0) - set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.spark-update-tool) -endif() set_target_properties(spark-update-tool PROPERTIES - ${BUNDLE_ID_OPTION} + # ${BUNDLE_ID_OPTION} # 如果上面取消注释,这里也取消注释 MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - MACOSX_BUNDLE TRUE - WIN32_EXECUTABLE TRUE + ) include(GNUInstallDirs) @@ -70,6 +56,3 @@ install(TARGETS spark-update-tool RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(spark-update-tool) -endif()