hyzboy/CMProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support qt5/6

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-01-14 18:44:28 +08:00
parent 9dd9d3d5c9
commit 544d0a8de5
10 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCMakeModule

@ -1 +1 @@
Subproject commit 98f891389a1e7c434ee5edb2b2b37b58d6ee408c Subproject commit cfb110c8b25e5f24c08d6b008d5ed5d76e7b576f

2
CMCore

@ -1 +1 @@
Subproject commit 3bc351435d4fb8f51cc5f890fc3ff37819ef69cd Subproject commit d6917e9339ca34419921ca5e3f746cdca83b6be7

2
CMPlatform

@ -1 +1 @@
Subproject commit eca08f0ae7aeaf81ab5818572b32051e16dd41a7 Subproject commit c91c3780f42df182fdb752b8165ed41a03358949

2
CMQT

@ -1 +1 @@
Subproject commit 7b306e4c0933cdf426d533519719f2c563878da2 Subproject commit bf196b5a695ebdbf7a3e0bd83c7875e4f60d9784

2
CMUtil

@ -1 +1 @@
Subproject commit 4734a558a159e21b468fcfee7b1a135c54a552dd Subproject commit 1cfb3d7c3ae58ef67dfbaff4b5c78f8236ae2541

26
CMakeLists.txt
View File

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

2
Examples

@ -1 +1 @@
Subproject commit e4b140c55a35e1c9aa75f74e4b33d0b40ad2a066 Subproject commit 05ab513b8b82785fad9ab501d00c00101d0074a5

2
ShaderBuilder

@ -1 +1 @@
Subproject commit 835186a423222dd531bdca130443968a72ab1a20 Subproject commit 9b4236724dc7b181f15b60edbc3c96fd288ad569

2
ShaderMaker

@ -1 +1 @@
Subproject commit 767bc0c636fa66bc9440c580dd96f574b177a21e Subproject commit fdc97b8823b1e20f5799205abd618a9a8a930c7b

2
TexConv

@ -1 +1 @@
Subproject commit 937177590fa050893c41bfa8bc30f02af1b5bd3e Subproject commit 90ea04048329367573774e8475fae4110677af10