From dc5bc7995d36732012e948d8911b71407a8368be Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Sat, 30 Mar 2024 08:24:12 +0800 Subject: [PATCH] [glm] Fix c++ language auto detection (#37823) --- ports/glm/portfile.cmake | 1 - ports/glm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glm.json | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 4884da86a1..c79e748176 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -11,7 +11,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGLM_ENABLE_CXX_17=ON -DGLM_BUILD_LIBRARY=ON -DGLM_BUILD_TESTS=OFF -DGLM_BUILD_INSTALL=ON diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json index 39f86a75ce..34a050ffa7 100644 --- a/ports/glm/vcpkg.json +++ b/ports/glm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glm", "version": "1.0.1", - "port-version": 1, + "port-version": 2, "description": "OpenGL Mathematics (GLM)", "homepage": "https://glm.g-truc.net", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 20b0e812af..581c087726 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3070,7 +3070,7 @@ }, "glm": { "baseline": "1.0.1", - "port-version": 1 + "port-version": 2 }, "globjects": { "baseline": "1.1.0", diff --git a/versions/g-/glm.json b/versions/g-/glm.json index f7662f4c68..82832d6719 100644 --- a/versions/g-/glm.json +++ b/versions/g-/glm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f323014ca30e742823ae0d6e1a47243000774c1", + "version": "1.0.1", + "port-version": 2 + }, { "git-tree": "99ce44c81afa595330ff215934019ac06ff34388", "version": "1.0.1",