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] Fix CMake warnings #27481

Merged
merged 5 commits into from
Oct 28, 2022
Merged

[glbinding] Fix CMake warnings #27481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f72b091
[glbinding] Fix CMake warnings
Cheney-W Oct 27, 2022
b2f5ebf
Use "version" instead of "version-string"
Cheney-W Oct 27, 2022
758caa9
x-add-version
Cheney-W Oct 27, 2022
7d4e44c
Restore the removed parameters
Cheney-W Oct 27, 2022
a5effe1
x-add-version
Cheney-W Oct 27, 2022
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
22 changes: 11 additions & 11 deletions ports/glbinding/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ vcpkg_from_github(
0004_fix-config-expected-paths.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DOPTION_BUILD_TESTS=OFF
-DOPTION_BUILD_GPU_TESTS=OFF
-DOPTION_BUILD_TOOLS=OFF
-DOPTION_BUILD_EXAMPLES=OFF
-DGIT_REV=0
-DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
-DOPTION_BUILD_EXAMPLES=OFF
MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_cpplocate
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
vcpkg_copy_pdbs()

## _IMPORT_PREFIX needs to go up one extra level in the directory tree.
Expand All @@ -48,12 +48,12 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
file(WRITE ${TARGET_CMAKE} "${_contents}")
endforeach()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Remove files already published by egl-registry
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR")

# Handle copyright
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY)
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
15 changes: 12 additions & 3 deletions ports/glbinding/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
{
"name": "glbinding",
"version-string": "3.1.0",
"port-version": 3,
"version": "3.1.0",
"port-version": 4,
"description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API",
"homepage": "https://github.com/cginternals/glbinding",
"license": "MIT",
"dependencies": [
"egl-registry"
"egl-registry",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2634,7 +2634,7 @@
},
"glbinding": {
"baseline": "3.1.0",
"port-version": 3
"port-version": 4
},
"glew": {
"baseline": "2.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glbinding.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5932f5a201e721aa59a787380b9448e1018bb4b3",
"version": "3.1.0",
"port-version": 4
},
{
"git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb",
"version-string": "3.1.0",
Expand Down