mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 20:13:07 +08:00
[glm] update to 0.9.9.2
This commit is contained in:
jasjuang
parent
90e627c7e6
commit
d23c403e2d
@ -1,3 +1,3 @@
|
||||
Source: glm
|
||||
Version: 0.9.9.0
|
||||
Version: 0.9.9.2
|
||||
Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
|
||||
|
||||
13
ports/glm/disable_warnings_as_error.patch
Normal file
13
ports/glm/disable_warnings_as_error.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 756673a3..5fbc8906 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||
message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler")
|
||||
endif()
|
||||
|
||||
- add_compile_options(/W4 /WX)
|
||||
+ add_compile_options(/W4)
|
||||
add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
@ -1,128 +0,0 @@
|
||||
diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp
|
||||
index f5c7f017..69c7274a 100644
|
||||
--- a/glm/detail/type_vec1.hpp
|
||||
+++ b/glm/detail/type_vec1.hpp
|
||||
@@ -39,6 +39,10 @@ namespace glm
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
|
||||
# pragma clang diagnostic ignored "-Wnested-anon-types"
|
||||
+# endif
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(push)
|
||||
+# pragma warning(disable: 4201)
|
||||
# endif
|
||||
|
||||
union
|
||||
@@ -60,6 +64,9 @@ namespace glm
|
||||
# endif//GLM_SWIZZLE*/
|
||||
};
|
||||
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(pop)
|
||||
+# endif
|
||||
# if GLM_COMPILER & GLM_COMPILER_CLANG
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp
|
||||
index a9af32e3..b8b8f32e 100644
|
||||
--- a/glm/detail/type_vec2.hpp
|
||||
+++ b/glm/detail/type_vec2.hpp
|
||||
@@ -38,6 +38,10 @@ namespace glm
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
|
||||
# pragma clang diagnostic ignored "-Wnested-anon-types"
|
||||
+# endif
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(push)
|
||||
+# pragma warning(disable: 4201)
|
||||
# endif
|
||||
|
||||
union
|
||||
@@ -60,6 +64,9 @@ namespace glm
|
||||
|
||||
};
|
||||
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(pop)
|
||||
+# endif
|
||||
# if GLM_COMPILER & GLM_COMPILER_CLANG
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp
|
||||
index f85f0a5c..28e6c6ed 100644
|
||||
--- a/glm/detail/type_vec3.hpp
|
||||
+++ b/glm/detail/type_vec3.hpp
|
||||
@@ -38,6 +38,10 @@ namespace glm
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
|
||||
# pragma clang diagnostic ignored "-Wnested-anon-types"
|
||||
+# endif
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(push)
|
||||
+# pragma warning(disable: 4201)
|
||||
# endif
|
||||
|
||||
union
|
||||
@@ -59,6 +63,9 @@ namespace glm
|
||||
# endif//GLM_SWIZZLE
|
||||
};
|
||||
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(pop)
|
||||
+# endif
|
||||
# if GLM_COMPILER & GLM_COMPILER_CLANG
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp
|
||||
index 5e89b744..0a16bc2c 100644
|
||||
--- a/glm/detail/type_vec4.hpp
|
||||
+++ b/glm/detail/type_vec4.hpp
|
||||
@@ -38,6 +38,10 @@ namespace glm
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
|
||||
# pragma clang diagnostic ignored "-Wnested-anon-types"
|
||||
+# endif
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(push)
|
||||
+# pragma warning(disable: 4201)
|
||||
# endif
|
||||
|
||||
union
|
||||
@@ -61,6 +65,9 @@ namespace glm
|
||||
# endif//GLM_SWIZZLE
|
||||
};
|
||||
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(pop)
|
||||
+# endif
|
||||
# if GLM_COMPILER & GLM_COMPILER_CLANG
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
|
||||
index 8af1c8bf..ff8c4aa6 100644
|
||||
--- a/glm/gtc/quaternion.hpp
|
||||
+++ b/glm/gtc/quaternion.hpp
|
||||
@@ -49,6 +49,10 @@ namespace glm
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
|
||||
# pragma clang diagnostic ignored "-Wnested-anon-types"
|
||||
+# endif
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(push)
|
||||
+# pragma warning(disable: 4201)
|
||||
# endif
|
||||
|
||||
union
|
||||
@@ -57,6 +61,9 @@ namespace glm
|
||||
typename detail::storage<T, sizeof(T) * 4, detail::is_aligned<P>::value>::type data;
|
||||
};
|
||||
|
||||
+# if GLM_COMPILER & GLM_COMPILER_VC
|
||||
+# pragma warning(pop)
|
||||
+# endif
|
||||
# if GLM_COMPILER & GLM_COMPILER_CLANG
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
--
|
||||
2.15.1.windows.2
|
||||
|
||||
@ -3,14 +3,14 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO g-truc/glm
|
||||
REF 0.9.9.0
|
||||
SHA512 b7a6996cb98bc334130c33a339275b50ea28d8dfce300f3d14ac52edf0b5c38bf216d318f411e898edef428876c0b2d1f6a6e951f160f31425fe0852ad150421
|
||||
REF 0.9.9.2
|
||||
SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES "${CMAKE_CURRENT_LIST_DIR}/ignore-warning-C4201.patch"
|
||||
PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch"
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user