diff --git a/CMCore b/CMCore index 9dd89aa5..07bd7729 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 9dd89aa5a34ef90b983895d32645df9b53cce955 +Subproject commit 07bd7729d08ffcf7d8efadc35764e09aa1e0c75f diff --git a/CMSceneGraph b/CMSceneGraph index 72fd3649..3b70a5c5 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 72fd3649f3c95966d7e87cefd6a0fc2faf564cd6 +Subproject commit 3b70a5c529ca06b52930e71e2c8ed5f7831f3e26 diff --git a/CMakeLists.txt b/CMakeLists.txt index 55650f83..3b4766a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,22 +8,22 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule) set(ULRE_3RDPTY_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty) +include_directories(${ULRE_3RDPTY_ROOT_PATH}/NvTriStrip) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) + +SET(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/inc) +SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + include(math) include(vulkan) include(use_cm_module) -use_cm_module(Core) -use_cm_module(Util) -use_cm_module(Platform) -use_cm_module(AssetsManage) -use_cm_module(SceneGraph) - SET(ULRE CMCore CMPlatform CMAssetsManage CMSceneGraph CMUtil - ULRE.Work + ULRE.Work ULRE.Util ULRE.ShaderGen ULRE.SceneGraph @@ -31,12 +31,11 @@ SET(ULRE CMCore ${RENDER_LIBRARY} ${Vulkan_LIBRARIES}) -include_directories(${ULRE_3RDPTY_ROOT_PATH}/NvTriStrip) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) - -SET(ROOT_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/inc) - -SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) +use_cm_module(Core) +use_cm_module(Util) +use_cm_module(Platform) +use_cm_module(AssetsManage) +use_cm_module(SceneGraph) add_subdirectory(src)