diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-23 15:40:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 15:40:20 -0700 |
| commit | e9b561fa4809a027089da0a726ebcd80a0043294 (patch) | |
| tree | a6f6f42be59881b402ea91455ede3e5a97218c9a | |
| parent | b376bf3ea2c6be8c9cae5b8e8eba7254dc38e3f7 (diff) | |
| parent | ceae20960f93592b5b8cd77fb3adfd98224906de (diff) | |
| download | vcpkg-e9b561fa4809a027089da0a726ebcd80a0043294.tar.gz vcpkg-e9b561fa4809a027089da0a726ebcd80a0043294.zip | |
Merge pull request #1128 from cloudhan/master
add dependency for gli
| -rw-r--r-- | ports/gli/CONTROL | 3 | ||||
| -rw-r--r-- | ports/gli/portfile.cmake | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL index 8d89bc2d1..b8edac798 100644 --- a/ports/gli/CONTROL +++ b/ports/gli/CONTROL @@ -1,3 +1,4 @@ Source: gli -Version: 0.8.2 +Version: 0.8.2-1 +Build-Depends: glm Description: OpenGL Image (GLI) https://gli.g-truc.net diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index c0854909f..305233619 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -1,20 +1,19 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gli-0.8.2.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/g-truc/gli/archive/0.8.2.0.tar.gz" - FILENAME "0.8.2.0.tar.gz" + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO g-truc/gli + REF 0.8.2.0 SHA512 c254a4e1497d0add985e4a882c552db99c512cc0e9cc72145d51a6e7deada817d624d9818099a47136a8a3ef1223a26a34e355e3c713166f0bb062e506059834 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) - -# Remove glm/CMakeLists.txt -file(REMOVE ${SOURCE_PATH}/glm/CMakeLists.txt) # Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/external/glm/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gli/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gli/copying.txt ${CURRENT_PACKAGES_DIR}/share/gli/copyright) +# manual.md contains the "licenses" section for the project +file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/gli/) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gli/manual.md ${CURRENT_PACKAGES_DIR}/share/gli/copyright) # Copy the glm header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/gli/*) +file(GLOB HEADER_FILES "${SOURCE_PATH}/gli/*.hpp" "${SOURCE_PATH}/gli/core") file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/gli) |