From 11aff346f1a15b6917a69d74d8a2110e150d21c5 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Sat, 29 Nov 2025 21:45:13 +0800 Subject: [PATCH] [Fix] (MG_Impl/Getter|CMake): avoid git hash header name collision with SPIRV-Cross --- CMakeLists.txt | 6 +++--- MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp | 2 +- .../MG_Util/Miscellany/{GitVersion.h.in => MGLGitHash.h.in} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename MobileGL/MG_Util/Miscellany/{GitVersion.h.in => MGLGitHash.h.in} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4fb70e3..d2dee31d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ if (MSVC) set(CMAKE_CXX_FLAGS "/EHsc ${CMAKE_CXX_FLAGS}") endif() -# Generate GitVersion.h +# Generate MGLGitHash.h execute_process( COMMAND git rev-parse HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} @@ -50,8 +50,8 @@ execute_process( string(SUBSTRING "${GIT_COMMIT_HASH_FULL}" 0 7 GIT_COMMIT_HASH_SHORT) configure_file( - ${CMAKE_SOURCE_DIR}/MobileGL/MG_Util/Miscellany/GitVersion.h.in - ${CMAKE_BINARY_DIR}/generated/GitVersion.h + ${CMAKE_SOURCE_DIR}/MobileGL/MG_Util/Miscellany/MGLGitHash.h.in + ${CMAKE_BINARY_DIR}/generated/MGLGitHash.h @ONLY ) diff --git a/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp b/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp index c3fb35f0..a6abe28b 100644 --- a/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp +++ b/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp @@ -1,6 +1,6 @@ #include "GL_Getter.h" #include -#include +#include #include #include #include diff --git a/MobileGL/MG_Util/Miscellany/GitVersion.h.in b/MobileGL/MG_Util/Miscellany/MGLGitHash.h.in similarity index 100% rename from MobileGL/MG_Util/Miscellany/GitVersion.h.in rename to MobileGL/MG_Util/Miscellany/MGLGitHash.h.in