Skip to content

Commit 1e942cd

Browse files
committed
vcpkg: update
1 parent 729472c commit 1e942cd

File tree

5 files changed

+3
-58
lines changed

5 files changed

+3
-58
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ jobs:
248248
if: always() # even if previous steps fail, this one needs to be run
249249
uses: actions/upload-artifact@v4
250250
with:
251-
name: vcpkg_logs
251+
name: vcpkg_linux_logs
252252
path: |
253253
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
254254
build/vcpkg/**/*.log

build/cmake/CMakeLists.txt

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ set(dir_name ruis)
99
# Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
1010
find_package(myci CONFIG REQUIRED)
1111

12-
find_package(Freetype CONFIG REQUIRED)
13-
find_package(JPEG REQUIRED)
14-
find_package(PNG REQUIRED)
15-
find_package(GLEW REQUIRED)
16-
1712
set(srcs)
1813
myci_add_source_files(srcs
1914
DIRECTORY
@@ -31,19 +26,7 @@ myci_declare_library(${name}
3126
DEPENDENCIES
3227
rasterimage
3328
r4
34-
papki
35-
tml
3629
utki
37-
agg
38-
veg
39-
mikroxml
40-
cssom
41-
svgdom
42-
svgren
4330
ruis
44-
EXTERNAL_DEPENDENCIES
45-
Freetype::Freetype
46-
JPEG::JPEG
47-
PNG::PNG
48-
GLEW::GLEW
31+
GLEW
4932
)

build/vcpkg/test/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,6 @@ set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
44

55
project(test)
66

7-
find_package(utki CONFIG REQUIRED)
8-
find_package(papki CONFIG REQUIRED)
9-
find_package(rasterimage CONFIG REQUIRED)
10-
find_package(r4 CONFIG REQUIRED)
11-
find_package(tml CONFIG REQUIRED)
12-
find_package(agg CONFIG REQUIRED)
13-
find_package(veg CONFIG REQUIRED)
14-
find_package(mikroxml CONFIG REQUIRED)
15-
find_package(cssom CONFIG REQUIRED)
16-
find_package(svgdom CONFIG REQUIRED)
17-
find_package(svgren CONFIG REQUIRED)
18-
find_package(ruis CONFIG REQUIRED)
19-
20-
find_package(Freetype CONFIG REQUIRED)
21-
find_package(ZLIB REQUIRED)
22-
find_package(JPEG REQUIRED)
23-
find_package(PNG REQUIRED)
24-
find_package(GLEW REQUIRED)
25-
267
find_package(ruis-render-opengl CONFIG REQUIRED)
278

289
add_executable(test main.cpp)

build/vcpkg/test/vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/cppfw/vcpkg-repo/",
11-
"baseline": "6ae7e906f7be239bd4f6ea6afe0761341c48769c",
11+
"baseline": "283350575dcac3509d5856a6c7b2ada036fc6454",
1212
"reference": "main",
1313
"packages": [
1414
"myci",

build/vcpkg/usage

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
ruis-render-opengl provides CMake targets:
22

3-
find_package(utki CONFIG REQUIRED)
4-
find_package(papki CONFIG REQUIRED)
5-
find_package(rasterimage CONFIG REQUIRED)
6-
find_package(r4 CONFIG REQUIRED)
7-
find_package(tml CONFIG REQUIRED)
8-
find_package(agg CONFIG REQUIRED)
9-
find_package(veg CONFIG REQUIRED)
10-
find_package(mikroxml CONFIG REQUIRED)
11-
find_package(cssom CONFIG REQUIRED)
12-
find_package(svgdom CONFIG REQUIRED)
13-
find_package(svgren CONFIG REQUIRED)
14-
find_package(ruis CONFIG REQUIRED)
15-
16-
find_package(Freetype CONFIG REQUIRED)
17-
find_package(ZLIB REQUIRED)
18-
find_package(JPEG REQUIRED)
19-
find_package(PNG REQUIRED)
20-
find_package(GLEW REQUIRED)
21-
223
find_package(ruis-render-opengl CONFIG REQUIRED)
234

245
target_link_libraries(main PRIVATE ruis-render-opengl::ruis-render-opengl)

0 commit comments

Comments
 (0)