support qt5/6

CMakeLists.txt

@@ -7,10 +7,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule)
 
+include(QtCommon)
 include(vulkan)
 include(math)
 include(use_cm_module)
 
+OPTION(CM_BUILD_TOOLS    OFF)
+OPTION(CM_BUILD_QT       OFF)
+option(CM_QT_EXTRA_STYLE OFF)
+
 use_cm_module(Core)
 use_cm_module(Platform)
 #use_cm_module(2D)
@@ -18,18 +23,13 @@ use_cm_module(Util)
 #use_cm_module(AssetsManage)
 use_cm_module(SceneGraph)
 
+if(CM_BUILD_QT)
+    use_cm_module(QT)
+endif()
+
 CMUtilSetup(${CMAKE_CURRENT_SOURCE_DIR}/CMUtil)
 
-OPTION(CM_BUILD_TOOLS       OFF)
-
 if(CM_BUILD_TOOLS)
-    OPTION(CM_BUILD_GUI_TOOLS   OFF)
-
-    IF(CM_BUILD_GUI_TOOLS)
-        include(QtCommon)
-
-        use_cm_module(QT)
-    ENDIF()
 
     if(WIN32)
         set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
@@ -38,9 +38,13 @@ if(CM_BUILD_TOOLS)
     set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
 
     add_subdirectory(TexConv)
-    add_subdirectory(ShaderMaker)
-    add_subdirectory(MeshConv)
+#    add_subdirectory(MeshConv)
     add_subdirectory(TextEncodeConvert)
+
+    IF(CM_BUILD_QT)
+        add_subdirectory(ShaderMaker)
+        add_subdirectory(ShaderBuilder)
+    endif(CM_BUILD_QT)
 endif(CM_BUILD_TOOLS)
 
 OPTION(CM_BUILD_EXAMPLES    OFF)