diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-06-12 21:28:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 21:28:29 -0700 |
| commit | e1d58276662e0a4d006142776421ae48740440c3 (patch) | |
| tree | 4e4ce326bf1b6ff1e559204ee77c5df9e8747aea | |
| parent | 555b760c67fcadea334c109b219c41b12b063413 (diff) | |
| download | vcpkg-e1d58276662e0a4d006142776421ae48740440c3.tar.gz vcpkg-e1d58276662e0a4d006142776421ae48740440c3.zip | |
[glbinding] remove conflict with other opengl ports (#6876)
| -rw-r--r-- | ports/glbinding/CONTROL | 3 | ||||
| -rw-r--r-- | ports/glbinding/portfile.cmake | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL index a6db3dcde..5e2d8a638 100644 --- a/ports/glbinding/CONTROL +++ b/ports/glbinding/CONTROL @@ -1,3 +1,4 @@ Source: glbinding -Version: 3.1.0 +Version: 3.1.0-1 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API +Build-Depends: egl-registry diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index 659d7c23c..dbbff30da 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_from_github( SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151 HEAD_REF master PATCHES - force-system-install.patch - fix-uwpmacro.patch + force-system-install.patch + fix-uwpmacro.patch ) vcpkg_configure_cmake( @@ -52,6 +52,9 @@ endforeach() file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/KHRplatform/KHRplatform-export.cmake)\nset(glbinding_FOUND TRUE)\n") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +# Remove files already published by egl-registry +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) + # Handle copyright file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright) |