This commit is contained in:
FullGreaM 2026-03-07 00:56:59 +03:00
parent b11e5ce852
commit e5740c383f

View File

@ -9,7 +9,9 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Network) # sudo apt install qt6-base-dev qt6-base-dev-tools
find_package(Qt6 REQUIRED)
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Network)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network)
set(PROJECT_SOURCES set(PROJECT_SOURCES
@ -23,6 +25,23 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(ConanCraft-Launcher qt_add_executable(ConanCraft-Launcher
MANUAL_FINALIZATION MANUAL_FINALIZATION
${PROJECT_SOURCES} ${PROJECT_SOURCES}
loading.h loading.cpp loading.ui
source.qrc
loading-worker.h loading-worker.cpp
locales.h
locales.cpp
install-java.h
install-java.cpp
network-downloader.h
network-downloader.cpp
fs-tools.cpp
fs-tools.h
prog-constains.h
prog-constains.cpp
install-i2p.h
install-i2p.cpp
i2p-controller.h i2p-controller.cpp
personal-account.h personal-account.cpp personal-account.ui
) )
# Define target properties for Android with Qt 6 as: # Define target properties for Android with Qt 6 as:
# set_property(TARGET ConanCraft-Launcher APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # set_property(TARGET ConanCraft-Launcher APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
@ -36,26 +55,7 @@ else()
# Define properties for Android with Qt 5 after find_package() calls as: # Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else() else()
add_executable(ConanCraft-Launcher # Qt5 is tool for sons of whole
${PROJECT_SOURCES}
loading.h loading.cpp loading.ui
source.qrc
loading-worker.h loading-worker.cpp
locales.h
locales.cpp
install-java.h
install-java.cpp
network-downloader.h
network-downloader.cpp
fs-tools.cpp
fs-tools.h
prog-constains.h
prog-constains.cpp
install-i2p.h
install-i2p.cpp
i2p-controller.h i2p-controller.cpp
personal-account.h personal-account.cpp personal-account.ui
)
endif() endif()
endif() endif()