Skip to content

Commit fc4de14

Browse files
authored
Merge pull request #75 from zao/fix/vendor-gli-port
fix: vendor gli port for cmake 4.0 compatibility
2 parents 17df2c9 + 527422f commit fc4de14

File tree

7 files changed

+80
-1
lines changed

7 files changed

+80
-1
lines changed

vcpkg-configuration.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"kind": "filesystem",
99
"path": "vcpkg-ports",
1010
"baseline": "2025-01-19",
11-
"packages": ["glfw3", "luajit"]
11+
"packages": ["glfw3", "gli", "luajit"]
1212
}
1313
]
1414
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 6f70f493..7d7828b4 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,4 +1,4 @@
6+
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
7+
+cmake_minimum_required(VERSION 3.15)
8+
cmake_policy(SET CMP0054 NEW)
9+
10+
project(gli)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 6eb1a68..610c0bc 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -71,7 +71,7 @@ endmacro(addExternalPackageGTC)
6+
# Add subdirectory
7+
8+
add_subdirectory(gli)
9+
-add_subdirectory(test)
10+
+#add_subdirectory(test)
11+
#add_subdirectory(doc)
12+
13+
################################
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#header-only library
2+
3+
vcpkg_from_github(
4+
OUT_SOURCE_PATH SOURCE_PATH
5+
REPO g-truc/gli
6+
REF 779b99ac6656e4d30c3b24e96e0136a59649a869
7+
SHA512 6e7ab46b7943cb185c8c1f6e45b765f5463e03628973043a0e8b866458ccceb5249f69a2a77b5e69c73f3ace85af96c7b9b2137685ceb6d0fcb67e491a49be69
8+
HEAD_REF master
9+
PATCHES
10+
bump-cmake-version.patch
11+
disable-test.patch
12+
)
13+
14+
vcpkg_cmake_configure(
15+
SOURCE_PATH "${SOURCE_PATH}"
16+
)
17+
18+
vcpkg_cmake_install()
19+
20+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gli)
21+
22+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
23+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
24+
file(REMOVE "${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt")
25+
26+
# Put the license file where vcpkg expects it
27+
# manual.md contains the "licenses" section for the project
28+
file(INSTALL "${SOURCE_PATH}/manual.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "gli",
3+
"version-date": "2021-07-06",
4+
"port-version": 3,
5+
"description": "OpenGL Image (GLI)",
6+
"homepage": "https://gli.g-truc.net",
7+
"dependencies": [
8+
"glm",
9+
{
10+
"name": "vcpkg-cmake",
11+
"host": true
12+
},
13+
{
14+
"name": "vcpkg-cmake-config",
15+
"host": true
16+
}
17+
]
18+
}

vcpkg-ports/versions/baseline.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
},
55
"2025-01-19": {
66
"glfw3": { "baseline": "3.4", "port-version": 1 },
7+
"gli": { "baseline": "2021-07-06", "port-version": 3 },
78
"luajit": { "baseline": "2023-04-16", "port-version": 1 }
89
}
910
}

vcpkg-ports/versions/g-/gli.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"versions": [
3+
{
4+
"version-date": "2021-07-06",
5+
"port-version": 3,
6+
"path": "$/ports/gli/2021-07-06_3"
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)