[glbinding] remove conflict with other opengl ports (#6876)

microsoft · Jun 13, 2019 · e1d5827 · e1d5827
1 parent 555b760
commit e1d5827
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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)