From bb03ff74e17ea48abb11ba0299726587b1dfe240 Mon Sep 17 00:00:00 2001
From: jyxiong <jingyu.xiong@foxmail.com>
Date: Sun, 10 Nov 2024 23:17:46 +0800
Subject: [PATCH] chore: update thrid party

---
 .gitmodules             | 3 +++
 CMakeLists.txt          | 2 +-
 cmake/glsl.cmake        | 6 +-----
 external/CMakeLists.txt | 7 ++++++-
 external/Vulkan-Headers | 2 +-
 external/fmt            | 1 +
 external/glslang        | 2 +-
 external/imgui          | 2 +-
 external/volk           | 2 +-
 9 files changed, 16 insertions(+), 11 deletions(-)
 create mode 160000 external/fmt

diff --git a/.gitmodules b/.gitmodules
index a8ffc33..ce6f498 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "external/VulkanMemoryAllocator"]
 	path = external/VulkanMemoryAllocator
 	url = git@github.com:GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+[submodule "external/fmt"]
+	path = external/fmt
+	url = git@github.com:fmtlib/fmt.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbc1c8..26b4e6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 
 project(procometject CXX)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
diff --git a/cmake/glsl.cmake b/cmake/glsl.cmake
index cc3b473..f17b2a6 100644
--- a/cmake/glsl.cmake
+++ b/cmake/glsl.cmake
@@ -1,11 +1,7 @@
-add_executable(glslang::validator IMPORTED)
-find_program(GLSLANG_VALIDATOR "glslangValidator" HINTS ${CMAKE_BINARY_DIR}/bin REQUIRED)
-set_property(TARGET glslang::validator PROPERTY IMPORTED_LOCATION ${GLSLANG_VALIDATOR})
-
 macro(compile_glsl GLSL_SHADER SPV_SHADER SPV_SHADERS)
     add_custom_command(
         OUTPUT ${SPV_SHADER}
-        COMMAND glslang::validator
+        COMMAND glslang-standalone
         ARGS ${GLSL_SHADER} --target-env vulkan1.3 -o ${SPV_SHADER} 
         MAIN_DEPENDENCY ${GLSL_SHADER}
         WORKING_DIRECTORY ${CMAKE_SHADERS_OUTPUT_DIRECTORY}
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3ce4a2d..63b29a5 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1,5 +1,10 @@
 set(EXTERNAL_DIR "external")
 
+if (NOT fmt)
+    add_subdirectory(fmt)
+    set_target_properties(fmt PROPERTIES FOLDER ${EXTERNAL_DIR}/fmt)
+endif ()
+
 if (NOT TARGET glfw)
     option(GLFW_BUILD_EXAMPLES "" OFF)
     option(GLFW_BUILD_TESTS "" OFF)
@@ -35,7 +40,7 @@ if (NOT TARGET imgui)
 endif ()
 
 if (NOT TARGET spdlog)
-    option(SPDLOG_USE_STD_FORMAT "" ON)
+    option(SPDLOG_FMT_EXTERNAL "" ON)
     add_subdirectory(spdlog)
     set_target_properties(spdlog PROPERTIES FOLDER ${EXTERNAL_DIR}/spdlog)
 endif ()
diff --git a/external/Vulkan-Headers b/external/Vulkan-Headers
index b379292..29f979e 160000
--- a/external/Vulkan-Headers
+++ b/external/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit b379292b2ab6df5771ba9870d53cf8b2c9295daf
+Subproject commit 29f979ee5aa58b7b005f805ea8df7a855c39ff37
diff --git a/external/fmt b/external/fmt
new file mode 160000
index 0000000..0041a40
--- /dev/null
+++ b/external/fmt
@@ -0,0 +1 @@
+Subproject commit 0041a40c1350ba702d475b9c4ad62da77caea164
diff --git a/external/glslang b/external/glslang
index fa9c3de..46ef757 160000
--- a/external/glslang
+++ b/external/glslang
@@ -1 +1 @@
-Subproject commit fa9c3deb49e035a8abcabe366f26aac010f6cbfb
+Subproject commit 46ef757e048e760b46601e6e77ae0cb72c97bd2f
diff --git a/external/imgui b/external/imgui
index d9f829d..368123a 160000
--- a/external/imgui
+++ b/external/imgui
@@ -1 +1 @@
-Subproject commit d9f829dd7155098cf745998aa209f514482c4fe3
+Subproject commit 368123ab06b2b573d585e52f84cd782c5c006697
diff --git a/external/volk b/external/volk
index 4660854..59d2690 160000
--- a/external/volk
+++ b/external/volk
@@ -1 +1 @@
-Subproject commit 466085407d5d2f50583fd663c1d65f93a7709d3e
+Subproject commit 59d26900f53c7621a8ba8ab0e3f18d3bd883fa9a