[glm] Bump to 1.0.0 (#36358)

* [glm] Bump to 1.0.0

* Update version database

* Fix build on android

* Update version database
This commit is contained in:
Weihang Ding 2024-01-27 01:32:30 +08:00 committed by GitHub
parent a5ba489727
commit 02344c986b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 28 additions and 36 deletions

View File

@ -1,23 +0,0 @@
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
project(glm LANGUAGES CXX)
include(GNUInstallDirs)
add_library(glm INTERFACE)
target_include_directories(glm INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
install(TARGETS glm EXPORT glm)
install(
EXPORT glm
FILE glm-config.cmake
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/glm"
NAMESPACE glm::
)
install(
DIRECTORY "${CMAKE_SOURCE_DIR}/glm"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
PATTERN "CMakeLists.txt" EXCLUDE
)

View File

@ -1,23 +1,26 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO g-truc/glm
REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8
SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c
REF "${VERSION}"
SHA512 62e22002a6369a54e1f0ee2885a65f2780af7d2a446573e5387b81518f5dc7e8076053837cb99ae850a0166ce8b0f077bed009e8986d9884d01c456ce467553f
HEAD_REF master
)
set(VCPKG_BUILD_TYPE release) # header-only port
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
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
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Put the license file where vcpkg expects it
file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

8
ports/glm/usage Normal file
View File

@ -0,0 +1,8 @@
The package glm provides CMake targets:
find_package(glm CONFIG REQUIRED)
target_link_libraries(main PRIVATE glm::glm)
# Or use the header-only version
find_package(glm CONFIG REQUIRED)
target_link_libraries(main PRIVATE glm::glm-header-only)

View File

@ -1,7 +1,6 @@
{
"name": "glm",
"version": "0.9.9.8",
"port-version": 2,
"version": "1.0.0",
"description": "OpenGL Mathematics (GLM)",
"homepage": "https://glm.g-truc.net",
"license": "MIT",

View File

@ -3029,8 +3029,8 @@
"port-version": 1
},
"glm": {
"baseline": "0.9.9.8",
"port-version": 2
"baseline": "1.0.0",
"port-version": 0
},
"globjects": {
"baseline": "1.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ed558e712eafccb124025c665c39f21998c71438",
"version": "1.0.0",
"port-version": 0
},
{
"git-tree": "6687c48e237aab1c30cf4c589d08f698f73cf178",
"version-date": "2023-06-08",