From b9d5aba136d9f411afdd130ab7ced4949052178c Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sat, 25 Jun 2022 22:51:22 +0800 Subject: [PATCH] moved a lot of qt codes to CMQT from CMPlatform --- CMPlatform | 2 +- CMQT | 2 +- CMakeLists.txt | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMPlatform b/CMPlatform index 3260601..0048db5 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 326060163fa5a7fdbb0daec04337d42e9216c2b0 +Subproject commit 0048db5b30152fa3c579bfc8116a085c91210e07 diff --git a/CMQT b/CMQT index 7ec16b6..70ca5d7 160000 --- a/CMQT +++ b/CMQT @@ -1 +1 @@ -Subproject commit 7ec16b63b9faf4d4c73b9b18dff81b3cc3ef69cc +Subproject commit 70ca5d727d41ed67ae7274e75642b8b104cb68ff diff --git a/CMakeLists.txt b/CMakeLists.txt index e7bc2dd..fe5835e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ if(CM_BUILD_TOOLS) IF(CM_BUILD_GUI_TOOLS) include(QtCommon) + + use_cm_module(QT) ENDIF() if(WIN32) @@ -39,10 +41,6 @@ if(CM_BUILD_TOOLS) add_subdirectory(ShaderMaker) add_subdirectory(MeshConv) add_subdirectory(TextEncodeConvert) - - IF(CM_BUILD_GUI_TOOLS) - add_subdirectory(CMWorkshop) - ENDIF() endif(CM_BUILD_TOOLS) OPTION(CM_BUILD_EXAMPLES OFF)