used vcpkg instead of sub-modules.

This commit is contained in:
2021-12-27 18:19:31 +08:00
parent b7b7ea9c47
commit c314e872f0
10 changed files with 11 additions and 19 deletions

3
.gitmodules vendored
View File

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

2
CMCore

Submodule CMCore updated: 021df224d0...1cefb338da

2
CMUtil

Submodule CMUtil updated: be9122db80...2c5a81b32b

View File

@@ -9,9 +9,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule)
include(vulkan) include(vulkan)
include(math) include(math)
use_glm(${CMAKE_CURRENT_SOURCE_DIR}/glm)
include(use_cm_module) include(use_cm_module)
use_cm_module(Core) use_cm_module(Core)
use_cm_module(Platform) use_cm_module(Platform)
#use_cm_module(2D) #use_cm_module(2D)
@@ -30,12 +29,9 @@ if(CM_BUILD_TOOLS)
include(QtCommon) include(QtCommon)
ENDIF() ENDIF()
if(WIN32) 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) set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
endif(WIN32) endif(WIN32)
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv) set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)

Submodule TexConv updated: 1a9631dae9...afe3dee96f

1
glm

Submodule glm deleted from 6ad79aae3e