diff --git a/CMakeLists.txt b/CMakeLists.txt index d6b608ca277e293aa87c91aae9a389a5d5975646..0002032268117866d2f3cd7b600de3a00e4ede1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.16.0) +cmake_minimum_required(VERSION 3.18.0) project(qt6ct LANGUAGES CXX) @@ -20,11 +20,14 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_BUILD_RPATH_USE_ORIGIN ON) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DUSE_WIDGETS) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060200 -DUSE_WIDGETS -DQT_DEPRECATED_WARNINGS -DQT_MESSAGELOGCONTEXT) +add_compile_options(-Wall -Wextra) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) -find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools) +find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools) get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION) diff --git a/README b/README index 618f0d1a639bfe2a007ce75d83d4bdfc25d3e382..d3b9fc8589e4ae76ad91b23228c2cd137faa6b49 100644 --- a/README +++ b/README @@ -8,9 +8,9 @@ Official home page: https://www.opencode.net/trialuser/qt6ct Requirements: - GNU Linux or FreeBSD -- qtbase >= 6.0.0 -- qtsvg >= 6.0.0 (Runtime dependency for the SVG icon support) -- qttools >= 6.0.0 (For build only) +- qtbase >= 6.2.0 +- qtsvg >= 6.2.0 (Runtime dependency for the SVG icon support) +- qttools >= 6.2.0 (For build only) Installation: diff --git a/qt6ct.pri b/qt6ct.pri index 2a57b480897e1d93e9c6ccdc055e5e2b0e79d157..d02bbd91da7042226e36bbfb6e685ec1c86c6aeb 100644 --- a/qt6ct.pri +++ b/qt6ct.pri @@ -8,8 +8,8 @@ QMAKE_DISTCLEAN += -r .build QMAKE_DISTCLEAN += translations/*.qm CONFIG += hide_symbols c++17 ordered -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_DEPRECATED_WARNINGS_SINCE=0x060200 -DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH +DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH QT_MESSAGELOGCONTEXT +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060200 QT_DEPRECATED_WARNINGS QMAKE_DISTCLEAN += -r .build #*-g++ { @@ -21,9 +21,8 @@ INCLUDEPATH += ../qt6ct-common QMAKE_LIBDIR += ../qt6ct-common LIBS += -lqt6ct-common - -!isEqual (QT_MAJOR_VERSION, 6) { - error("Use Qt 6.0.0 or higher.") +!isEqual(QT_MAJOR_VERSION, 6)|!greaterThan(QT_MINOR_VERSION, 1) { + error("Use Qt 6.2.0 or higher.") } #Install paths diff --git a/src/qt6ct-common/CMakeLists.txt b/src/qt6ct-common/CMakeLists.txt index f748167a6d492a646a6f1e331ea2f5b6efb91546..3b9f0b9ce3067eeb38f219c586eec6d58a837b04 100644 --- a/src/qt6ct-common/CMakeLists.txt +++ b/src/qt6ct-common/CMakeLists.txt @@ -22,8 +22,6 @@ set(app_SRCS qt6ct.cpp ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) - add_library(qt6ct-common SHARED ${app_SRCS}) set_target_properties(qt6ct-common PROPERTIES VERSION ${QT6CT_VERSION}) target_link_libraries(qt6ct-common PRIVATE Qt6::Gui) diff --git a/src/qt6ct-qtplugin/CMakeLists.txt b/src/qt6ct-qtplugin/CMakeLists.txt index c3d749896370b6e8242694146221d88e78d077b2..93a2b84b99819abc6eeae65d766c0f9190901988 100644 --- a/src/qt6ct-qtplugin/CMakeLists.txt +++ b/src/qt6ct-qtplugin/CMakeLists.txt @@ -5,8 +5,6 @@ set(app_SRCS qt6ctplatformtheme.cpp ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) - add_library(qt6ct-qtplugin MODULE ${app_SRCS}) set_target_properties(qt6ct-qtplugin PROPERTIES OUTPUT_NAME qt6ct) target_link_libraries(qt6ct-qtplugin PRIVATE Qt6::Widgets Qt6::GuiPrivate qt6ct-common) diff --git a/src/qt6ct-style/CMakeLists.txt b/src/qt6ct-style/CMakeLists.txt index ea8f426aa701aefd330ae5664f83427b690c963d..5ab1c21c0d68f18417ce8e5d2d974829316dfdb9 100644 --- a/src/qt6ct-style/CMakeLists.txt +++ b/src/qt6ct-style/CMakeLists.txt @@ -7,8 +7,6 @@ set(app_SRCS qt6ctproxystyle.cpp ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) - add_library(qt6ct-style MODULE ${app_SRCS}) target_link_libraries(qt6ct-style PRIVATE Qt6::Widgets qt6ct-common) install(TARGETS qt6ct-style DESTINATION ${PLUGINDIR}/styles)