Fuck Qt5
This commit is contained in:
parent
b11e5ce852
commit
e5740c383f
@ -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,21 +25,6 @@ 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}
|
||||||
)
|
|
||||||
# Define target properties for Android with Qt 6 as:
|
|
||||||
# set_property(TARGET ConanCraft-Launcher 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(ConanCraft-Launcher 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(ConanCraft-Launcher
|
|
||||||
${PROJECT_SOURCES}
|
|
||||||
loading.h loading.cpp loading.ui
|
loading.h loading.cpp loading.ui
|
||||||
source.qrc
|
source.qrc
|
||||||
loading-worker.h loading-worker.cpp
|
loading-worker.h loading-worker.cpp
|
||||||
@ -56,6 +43,19 @@ else()
|
|||||||
i2p-controller.h i2p-controller.cpp
|
i2p-controller.h i2p-controller.cpp
|
||||||
personal-account.h personal-account.cpp personal-account.ui
|
personal-account.h personal-account.cpp personal-account.ui
|
||||||
)
|
)
|
||||||
|
# Define target properties for Android with Qt 6 as:
|
||||||
|
# set_property(TARGET ConanCraft-Launcher 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(ConanCraft-Launcher 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()
|
||||||
|
# Qt5 is tool for sons of whole
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user