Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glbinding] remove conflict with other opengl ports #6876

Merged
merged 1 commit into from
Jun 13, 2019
Merged

[glbinding] remove conflict with other opengl ports #6876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/glbinding/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 5 additions & 2 deletions ports/glbinding/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)

Expand Down