chore: update thrid party

jyxiong · Nov 10, 2024 · bb03ff7 · bb03ff7
1 parent 5638060
commit bb03ff7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "external/VulkanMemoryAllocator"]
 	path = external/VulkanMemoryAllocator
 	url = [email protected]:GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+[submodule "external/fmt"]
+	path = external/fmt
+	url = [email protected]:fmtlib/fmt.git
diff --git 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
@@ -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
@@ -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
diff --git a/external/fmt b/external/fmt
diff --git a/external/glslang b/external/glslang
diff --git a/external/imgui b/external/imgui
diff --git a/external/volk b/external/volk