aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-06-20 15:22:25 -0700
committerGitHub <noreply@github.com>2017-06-20 15:22:25 -0700
commit9f0f110f36ed9b91b1fa2b2ab1165555b540af4d (patch)
tree053c9988f30a419dbbaf8384664b79a638a8b47b /ports
parent1bebd8d40d60f5958abe8fe5015125407fabc07c (diff)
parent338f8614e3e0e8bd96b80c88fce825f02c2e0721 (diff)
downloadvcpkg-9f0f110f36ed9b91b1fa2b2ab1165555b540af4d.tar.gz
vcpkg-9f0f110f36ed9b91b1fa2b2ab1165555b540af4d.zip
Merge pull request #1321 from jasjuang/master
enable cmake config for glm
Diffstat (limited to 'ports')
-rw-r--r--ports/glm/CONTROL2
-rw-r--r--ports/glm/portfile.cmake32
2 files changed, 20 insertions, 14 deletions
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL
index 3e1f91148..2f7355c30 100644
--- a/ports/glm/CONTROL
+++ b/ports/glm/CONTROL
@@ -1,3 +1,3 @@
Source: glm
-Version: 0.9.8.1
+Version: 0.9.8.4
Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake
index 4780a1b39..ff988c47b 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -1,20 +1,26 @@
-#header-only library
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glm)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/g-truc/glm/releases/download/0.9.8.1/glm-0.9.8.1.zip"
- FILENAME "glm-0.9.8.1.zip"
- SHA512 93223ea7a08d969331a6b93d598c0b59dfc09e86770661c444f81939bd175053d3f6b1211a4aa4e59d732df39b97fe491eb35d4ac2efb286a1cf68ed29bfa80a
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO g-truc/glm
+ REF 0.9.8.4
+ SHA512 ff0e0651a695caebe9235882d14e09546d52b3cdf66cca8e2078f15b02a3fca4e47bd97d2807aa329f76aa633af3b4999501bd4d0b22ad44b00558d4917f39ed
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
)
-vcpkg_extract_source_archive(${ARCHIVE})
-# Remove glm/CMakeLists.txt
-file(REMOVE ${SOURCE_PATH}/glm/CMakeLists.txt)
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glm")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Put the license file where vcpkg expects it
file(COPY ${SOURCE_PATH}/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glm/copying.txt ${CURRENT_PACKAGES_DIR}/share/glm/copyright)
-
-# Copy the glm header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/glm/*)
-file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/glm)