Skip to content

Commit 746c6b7

Browse files
committed
vcpkg: update
1 parent 75dd4aa commit 746c6b7

File tree

5 files changed

+2
-52
lines changed

5 files changed

+2
-52
lines changed

.github/workflows/ci.yml

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

build/cmake/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +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(PNG REQUIRED)
13-
find_package(JPEG REQUIRED)
14-
find_package(Freetype CONFIG REQUIRED)
15-
1612
set(srcs)
1713
myci_add_source_files(srcs
1814
DIRECTORY
@@ -30,18 +26,6 @@ myci_declare_library(${name}
3026
DEPENDENCIES
3127
rasterimage
3228
r4
33-
papki
34-
tml
3529
utki
36-
agg
37-
veg
38-
mikroxml
39-
cssom
40-
svgdom
41-
svgren
4230
ruis
43-
EXTERNAL_DEPENDENCIES
44-
Freetype::Freetype
45-
JPEG::JPEG
46-
PNG::PNG
4731
)

build/vcpkg/test/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +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-
find_package(ZLIB REQUIRED)
20-
find_package(PNG REQUIRED)
21-
find_package(JPEG REQUIRED)
22-
find_package(Freetype CONFIG REQUIRED)
23-
247
find_package(ruis-render-null CONFIG REQUIRED)
258

269
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 & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
ruis-render-null 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-
find_package(ZLIB REQUIRED)
16-
find_package(PNG REQUIRED)
17-
find_package(JPEG REQUIRED)
18-
find_package(Freetype CONFIG REQUIRED)
19-
203
find_package(ruis-render-null CONFIG REQUIRED)
214

225
target_link_libraries(main PRIVATE ruis-render-null::ruis-render-null)

0 commit comments

Comments
 (0)