[glm] Modernization (#29314)

* [glm] Modernization

* update version database
This commit is contained in:
xiaozhuai, Weihang Ding 2023-02-01 04:34:37 +08:00 committed by GitHub
parent 0a8ac2f124
commit 09c963efbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 39 deletions

View File

@ -1,27 +1,23 @@
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-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/
)
install(
EXPORT glm-config
NAMESPACE glm::
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/glm
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.hpp*" PATTERN "*.inl*" PATTERN "*.h*"
)
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

@ -6,17 +6,18 @@ vcpkg_from_github(
HEAD_REF master
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
set(VCPKG_BUILD_TYPE release) # header-only port
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
# Put the license file where vcpkg expects it
file(INSTALL ${SOURCE_PATH}/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,18 @@
{
"name": "glm",
"version-string": "0.9.9.8",
"port-version": 1,
"version": "0.9.9.8",
"port-version": 2,
"description": "OpenGL Mathematics (GLM)",
"homepage": "https://glm.g-truc.net"
"homepage": "https://glm.g-truc.net",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -2710,7 +2710,7 @@
},
"glm": {
"baseline": "0.9.9.8",
"port-version": 1
"port-version": 2
},
"globjects": {
"baseline": "1.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b940020b1f2958fcc468c615becec6ca5ad3bff5",
"version": "0.9.9.8",
"port-version": 2
},
{
"git-tree": "4aafac80f39a72fadaf6a31afb961790678062de",
"version-string": "0.9.9.8",