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

used vcpkg instead of sub-modules.

Browse Source
This commit is contained in:
hyzboy 2021-12-27 18:19:31 +08:00
parent b7b7ea9c47
commit c314e872f0
10 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -37,6 +37,3 @@
[submodule "TextEncodeConvert"]
path = TextEncodeConvert
url = https://github.com/hyzboy/TextEncodeConvert.git
[submodule "glm"]
path = glm
url = https://github.com/g-truc/glm.git

2
CMCMakeModule

@ -1 +1 @@
Subproject commit e78ebebee1c373346ab6da0ee1a174090825f29a
Subproject commit 78046ef7e5a33ace87bb7a858dccab4fe737d24a

2
CMCore

@ -1 +1 @@
Subproject commit 021df224d02430159428c51c01883ce23ab4f03e
Subproject commit 1cefb338da8887ceaf800aecc9e1bc24dee63e8c

2
CMSceneGraph

@ -1 +1 @@
Subproject commit b5b673f8a65a0c1a8b4972f81e45122bad5155a5
Subproject commit 7c8a5888a72d091e6bf6192226dec16d84d50245

2
CMUtil

@ -1 +1 @@
Subproject commit be9122db80512d3c046fe68b3b9948dd2078dec7
Subproject commit 2c5a81b32b7ee1a5dd40010c8c62f6cff4a87945

12
CMakeLists.txt
View File

@ -9,9 +9,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule)
include(vulkan)
include(math)
use_glm(${CMAKE_CURRENT_SOURCE_DIR}/glm)
include(use_cm_module)
use_cm_module(Core)
use_cm_module(Platform)
#use_cm_module(2D)
@ -30,12 +29,9 @@ if(CM_BUILD_TOOLS)
include(QtCommon)
ENDIF()
if(WIN32)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include")
link_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
endif(WIN32)
if(WIN32)
set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
endif(WIN32)
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)

2
MeshConv

@ -1 +1 @@
Subproject commit 2f13c57348113928382521b50e7f100b8cdf372d
Subproject commit fcbdf1941c785e29f0785904d9dd0de9b07ba41b

2
ShaderMaker

@ -1 +1 @@
Subproject commit b82dade250fbc65217775793b5cab8a1cc302c77
Subproject commit f4d0557184562a8167d9f92d2e0bcfb084522dec

2
TexConv

@ -1 +1 @@
Subproject commit 1a9631dae9b94a51516cfb669cb10dd44a114989
Subproject commit afe3dee96f5a2a43b9bb298e55851b2c784f95d1

1
glm

@ -1 +0,0 @@
Subproject commit 6ad79aae3eb5bf809c30bf1168171e9e55857e45