зеркало из https://github.com/microsoft/vcpkg.git
[glm] fix clang compile (#39408)
This commit is contained in:
Родитель
3ccaadb794
Коммит
03d3703880
|
@ -0,0 +1,17 @@
|
|||
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
|
||||
index 315eb346..21ccebf4 100644
|
||||
--- a/glm/detail/setup.hpp
|
||||
+++ b/glm/detail/setup.hpp
|
||||
@@ -595,7 +595,11 @@
|
||||
# define GLM_DEPRECATED __declspec(deprecated)
|
||||
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name
|
||||
#elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG | GLM_COMPILER_INTEL)
|
||||
-# define GLM_DEPRECATED __attribute__((__deprecated__))
|
||||
+# if GLM_LANG & GLM_LANG_CXX14_FLAG
|
||||
+# define GLM_DEPRECATED [[deprecated]]
|
||||
+# else
|
||||
+# define GLM_DEPRECATED __attribute__((__deprecated__))
|
||||
+# endif
|
||||
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment)))
|
||||
#elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP)
|
||||
# define GLM_DEPRECATED
|
|
@ -6,6 +6,8 @@ vcpkg_from_github(
|
|||
REF "${VERSION}"
|
||||
SHA512 c6c6fa1ea7a7e97820e36ee042a78be248ae828c99c1b1111080d9bf334a5160c9993a70312351c92a867cd49907c95f9f357c8dfe2bc29946da6e83e27ba20c
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-clang.patch # Backport https://github.com/g-truc/glm/pull/1286. Remove with next update.
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "glm",
|
||||
"version": "1.0.1",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "OpenGL Mathematics (GLM)",
|
||||
"homepage": "https://glm.g-truc.net",
|
||||
"license": "MIT",
|
||||
|
|
|
@ -3090,7 +3090,7 @@
|
|||
},
|
||||
"glm": {
|
||||
"baseline": "1.0.1",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"globjects": {
|
||||
"baseline": "1.1.0",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f8b09027afe97c717e95bd81d1d4f37c057d1c78",
|
||||
"version": "1.0.1",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "9f323014ca30e742823ae0d6e1a47243000774c1",
|
||||
"version": "1.0.1",
|
||||
|
|
Загрузка…
Ссылка в новой задаче