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

Jump to bottom

[gli] upgrade the gli to latest #18715

Merged
merged 5 commits into from
Jul 8, 2021
Merged

[gli] upgrade the gli to latest #18715

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae4c0e1
upgrade the gli to latest
jixingcn Jun 29, 2021
93ed851
update the version of gli
jixingcn Jun 29, 2021
253108e
update the version of gli
jixingcn Jun 30, 2021
0f33136
Merge remote-tracking branch 'origin/master' into upgrade-gli
jixingcn Jun 30, 2021
0afb373
[gli] Revert patch, use date scheme
ras0219-msft Jul 6, 2021
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
2 changes: 1 addition & 1 deletion ports/gli/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: gli
Version: dd17acf-1
Version: 779b99a
jixingcn marked this conversation as resolved.
Show resolved Hide resolved
Build-Depends: glm
Description: OpenGL Image (GLI)
Homepage: https://gli.g-truc.net
26 changes: 13 additions & 13 deletions ports/gli/disable-test.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eb1a68..610c0bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ endmacro(addExternalPackageGTC)
# Add subdirectory
add_subdirectory(gli)
-add_subdirectory(test)
+#add_subdirectory(test)
#add_subdirectory(doc)
################################
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f70f493..75b92d89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ endmacro(addExternalPackageGTC)
# Add subdirectory

add_subdirectory(gli)
-add_subdirectory(test)
+#add_subdirectory(test)
#add_subdirectory(doc)

################################
jixingcn marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 3 additions & 3 deletions ports/gli/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO g-truc/gli
REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82
SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b
REF 779b99ac6656e4d30c3b24e96e0136a59649a869
SHA512 6e7ab46b7943cb185c8c1f6e45b765f5463e03628973043a0e8b866458ccceb5249f69a2a77b5e69c73f3ace85af96c7b9b2137685ceb6d0fcb67e491a49be69
HEAD_REF master
PATCHES
disable-test.patch
Expand All @@ -17,7 +17,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli TARGET_PATH share/gli)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "779b99ac6656e4d30c3b24e96e0136a59649a869",
"version-string": "779b99a",
"port-version": 0
},
{
"git-tree": "d6453871d306fd1f5501954f4b3722f97cd525d4",
"version-string": "dd17acf-1",
Expand Down