diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-02-10 23:55:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 23:55:18 -0800 |
| commit | 087869eb3a70f17dd98b4a9ebd7182ab31a4b1e4 (patch) | |
| tree | 41c3f9da0ed1728c9efdba0bed562917ce7a7804 | |
| parent | c4cebb40a28b489ff98f3f435210f64198731c1c (diff) | |
| download | vcpkg-087869eb3a70f17dd98b4a9ebd7182ab31a4b1e4.tar.gz vcpkg-087869eb3a70f17dd98b4a9ebd7182ab31a4b1e4.zip | |
[glfw3/glew] Fix pkgconfig (#16166)
* [glfw3/glew] Fix pkgconfig
* update version record
| -rw-r--r-- | ports/glew/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glew/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/glfw3/CONTROL | 1 | ||||
| -rw-r--r-- | ports/glfw3/portfile.cmake | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/g-/glew.json | 5 | ||||
| -rw-r--r-- | versions/g-/glfw3.json | 5 |
7 files changed, 18 insertions, 3 deletions
diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 143426801..5d8250fd5 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,6 +1,6 @@ Source: glew Version: 2.1.0 -Port-Version: 9 +Port-Version: 10 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. Homepage: https://github.com/nigels-com/glew Build-Depends: opengl diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 5b931ecb2..6ca6591d9 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -23,6 +23,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) +# Skip check the required dependency opengl +vcpkg_fixup_pkgconfig(SKIP_CHECK) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(_targets_cmake_files) diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL index 45b452b1f..a6e7761f8 100644 --- a/ports/glfw3/CONTROL +++ b/ports/glfw3/CONTROL @@ -1,4 +1,5 @@ Source: glfw3 Version: 3.3.2 +Port-Version: 1 Homepage: https://github.com/glfw/glfw Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc. diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 393ecdd03..aac7c8942 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -30,6 +30,8 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glfw3) +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 069113e58..116382f91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2194,11 +2194,11 @@ }, "glew": { "baseline": "2.1.0", - "port-version": 9 + "port-version": 10 }, "glfw3": { "baseline": "3.3.2", - "port-version": 0 + "port-version": 1 }, "gli": { "baseline": "dd17acf-1", diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 1901c1e6b..78ebd98dd 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c87d7f619c69630fa4d1bd0bf3767f0d31ef22d6", + "version-string": "2.1.0", + "port-version": 10 + }, + { "git-tree": "f8fbe21d53746e72320d363c852bb10f734e5237", "version-string": "2.1.0", "port-version": 9 diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index 36e2809ce..51357e2b0 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c25e50efb2dc33ea70dae0e62936987d82bffcec", + "version-string": "3.3.2", + "port-version": 1 + }, + { "git-tree": "948e1bd3085f0de7b3af12c5a71afe1c8969ea55", "version-string": "3.3.2", "port-version": 0 |