Skip to content

Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used #18858

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

Merged
Billy O'Neal (BillyONeal) merged 1 commit into from
Jul 8, 2021
Merged

Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used #18858

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
5 changes: 0 additions & 5 deletions ports/gl3w/CONTROL
View file
Open in desktop

This file was deleted.

25 changes: 15 additions & 10 deletions ports/gl3w/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,27 @@ vcpkg_from_github(
0001-enable-shared-build.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL)
# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used
vcpkg_download_distfile(KHRPLATFORM_H
URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h"
FILENAME khrplatform.h
SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL")
file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR")

vcpkg_find_acquire_program(PYTHON3)

vcpkg_execute_required_process(
COMMAND ${PYTHON3} ${SOURCE_PATH}/gl3w_gen.py
WORKING_DIRECTORY ${SOURCE_PATH}
COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py"
WORKING_DIRECTORY "${SOURCE_PATH}"
LOGNAME gl3w-gen
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
)
Expand All @@ -30,10 +38,7 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(HEADER ${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h)
file(READ ${HEADER} _contents)
string(REPLACE "#define GL3W_API" "#define GL3W_API __declspec(dllimport)" _contents "${_contents}")
file(WRITE ${HEADER} "${_contents}")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)")
endif()

file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gl3w RENAME copyright)
file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
10 changes: 10 additions & 0 deletions ports/gl3w/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "gl3w",
"version-date": "2018-05-31",
"port-version": 3,
"description": "Simple OpenGL core profile loading",
"homepage": "https://github.com/skaslev/gl3w",
"dependencies": [
"opengl-registry"
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2285,8 +2285,8 @@
"port-version": 0
},
"gl3w": {
"baseline": "2018-05-31-2",
"port-version": 0
"baseline": "2018-05-31",
"port-version": 3
},
"glad": {
"baseline": "0.1.34",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gl3w.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bbd82479631534cfe954646d63d29734c3b7728f",
"version-date": "2018-05-31",
"port-version": 3
},
{
"git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886",
"version-string": "2018-05-31-2",
Expand Down