From f9ae3ba570186753bab12ecedb32469937d82c17 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 20 Oct 2023 01:28:17 +0300 Subject: [PATCH] [glm] Restore version 0.9.9.8 (#34591) * [glm] Restore version 0.9.9.8 * revert glm update --------- Co-authored-by: Javier Matos Denizac --- ports/glm/portfile.cmake | 8 ++++---- ports/glm/usage | 4 ---- ports/glm/vcpkg.json | 3 ++- versions/baseline.json | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 ports/glm/usage diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index a3e5e2e8c9..133c81ec6e 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF 5c46b9c07008ae65cb81ab79cd677ecc1934b903 # commit on 2023-06-08 - SHA512 17315dd05059accf3d4084d35dd037d4001f88a1d91da9a6fd5cedecab652c8bef8efa89cd45e21cd227f964a03408401edc2384c22e50caa449abf71b23fd6a + REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 + SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c HEAD_REF master ) @@ -19,5 +19,5 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glm/usage b/ports/glm/usage deleted file mode 100644 index 95602ece2b..0000000000 --- a/ports/glm/usage +++ /dev/null @@ -1,4 +0,0 @@ -glm provides CMake targets: - - find_package(glm CONFIG REQUIRED) - target_link_libraries(main PRIVATE glm::glm) diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json index 91bf95e6b0..a81138c051 100644 --- a/ports/glm/vcpkg.json +++ b/ports/glm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glm", - "version-date": "2023-06-08", + "version": "0.9.9.8", + "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 074c5b86c4..fbd331fbbd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2957,8 +2957,8 @@ "port-version": 1 }, "glm": { - "baseline": "2023-06-08", - "port-version": 0 + "baseline": "0.9.9.8", + "port-version": 2 }, "globjects": { "baseline": "1.1.0",