From c91c3780f42df182fdb752b8165ed41a03358949 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sat, 14 Jan 2023 18:39:39 +0800 Subject: [PATCH] support QT5/QT6 --- CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1df0ef..547b7c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,17 +5,9 @@ project(CMPlatform) include(path_config.cmake) CMPlatformSetup(${CMAKE_CURRENT_SOURCE_DIR}) -OPTION(BUILD_QT_SUPPORT_LIB OFF) +IF(CM_BUILD_QT) -IF(BUILD_QT_SUPPORT_LIB) - - add_definitions("-DHGL_QT5") - - set(QT_MIN_VERSION "5.14.0") - find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core) - - include_directories(${Qt5Core_INCLUDES}) - add_definitions(${Qt5Core_DEFINITIONS}) + find_package(Qt${CM_QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core) IF(WIN32) SET(HGL_QT_MAIN_SOURCE ${CMPLATFORM_ROOT_SOURCE_PATH}/src/QT/QTWinUCS2.cpp) @@ -23,7 +15,7 @@ IF(BUILD_QT_SUPPORT_LIB) SET(HGL_QT_MAIN_SOURCE ${CMPLATFORM_ROOT_SOURCE_PATH}/src/QT/QTUnixUTF8.cpp) ENDIF() - SET(HGL_QT_LIB CM.QT5Support) + SET(HGL_QT_LIB CM.Qt${CM_QT_MAJOR_VERSION}Support) ENDIF() add_subdirectory(${CMPLATFORM_ROOT_SOURCE_PATH})