Skip to content

Commit 865b46c

Browse files
igagisigagis
committed
vcpkg: update
1 parent 49767b3 commit 865b46c

6 files changed

Lines changed: 37 additions & 159 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -293,31 +293,31 @@ jobs:
293293
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
294294
done
295295
if: startsWith(github.ref, 'refs/tags/')
296-
##### msvs #####
297-
msvs:
298-
runs-on: windows-latest
299-
defaults:
300-
run:
301-
shell: powershell
302-
steps:
303-
- name: git clone
304-
uses: actions/checkout@v3
305-
- name: install CoAPP tools
306-
uses: myci-actions/install-coapp-tools@main
307-
- name: nuget update
308-
run: |
309-
nuget restore msvs_solution/msvs_solution.sln
310-
nuget update msvs_solution/msvs_solution.sln
311-
- name: add msbuild to PATH
312-
uses: microsoft/setup-msbuild@v1.1
313-
- name: build
314-
run: .\nuget\build_nuget.ps1
315-
- name: deploy
316-
uses: myci-actions/publish-nuget@main
317-
with:
318-
filename: '.\nuget\*.nupkg'
319-
api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
320-
if: startsWith(github.ref, 'refs/tags/')
296+
##### msvs ##### DEPRECATED
297+
# msvs:
298+
# runs-on: windows-latest
299+
# defaults:
300+
# run:
301+
# shell: powershell
302+
# steps:
303+
# - name: git clone
304+
# uses: actions/checkout@v3
305+
# - name: install CoAPP tools
306+
# uses: myci-actions/install-coapp-tools@main
307+
# - name: nuget update
308+
# run: |
309+
# nuget restore msvs_solution/msvs_solution.sln
310+
# nuget update msvs_solution/msvs_solution.sln
311+
# - name: add msbuild to PATH
312+
# uses: microsoft/setup-msbuild@v1.1
313+
# - name: build
314+
# run: .\nuget\build_nuget.ps1
315+
# - name: deploy
316+
# uses: myci-actions/publish-nuget@main
317+
# with:
318+
# filename: '.\nuget\*.nupkg'
319+
# api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
320+
# if: startsWith(github.ref, 'refs/tags/')
321321
##### vcpkg-linux #####
322322
vcpkg-linux:
323323
strategy:

‎build/cmake/CMakeLists.txt‎

Lines changed: 9 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,6 @@ project(${name})
77
# Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
88
find_package(myci CONFIG REQUIRED)
99

10-
find_package(JPEG REQUIRED)
11-
find_package(PNG REQUIRED)
12-
find_package(GLEW REQUIRED)
13-
find_package(Freetype CONFIG REQUIRED)
14-
15-
if(LINUX)
16-
find_package(PkgConfig REQUIRED)
17-
pkg_check_modules(GDK3 REQUIRED IMPORTED_TARGET "gdk-3.0")
18-
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET "x11")
19-
pkg_check_modules(EGL REQUIRED IMPORTED_TARGET "egl")
20-
pkg_check_modules(GLES2 REQUIRED IMPORTED_TARGET "glesv2")
21-
set(linux_deps
22-
PkgConfig::GDK3
23-
PkgConfig::X11
24-
PkgConfig::EGL
25-
PkgConfig::GLES2
26-
)
27-
set(windows_deps)
28-
elseif(WIN32)
29-
find_package(unofficial-angle CONFIG REQUIRED)
30-
set(linux_deps)
31-
set(windows_deps
32-
unofficial::angle::libGLESv2
33-
unofficial::angle::libEGL
34-
)
35-
else()
36-
set(linux_deps)
37-
set(windows_deps)
38-
endif()
39-
4010
set(srcs)
4111
myci_add_source_files(srcs
4212
DIRECTORY
@@ -54,28 +24,12 @@ myci_declare_library(${name}-opengl
5424
PUBLIC_COMPILE_DEFINITIONS
5525
"RUISAPP_RENDER_OPENGL"
5626
DEPENDENCIES
57-
rasterimage
58-
r4
59-
papki
60-
tml
61-
utki
62-
agg
63-
veg
64-
mikroxml
65-
cssom
66-
svgdom
67-
svgren
68-
opros
6927
nitki
7028
ruis
7129
ruis-render-opengl
72-
EXTERNAL_DEPENDENCIES
73-
JPEG::JPEG
74-
PNG::PNG
75-
GLEW::GLEW
76-
Freetype::Freetype
77-
${linux_deps}
78-
${windows_deps}
30+
LINUX_ONLY_DEPENDENCIES
31+
PkgConfig::gdk-3.0
32+
PkgConfig::x11
7933
NO_EXPORT
8034
)
8135

@@ -90,26 +44,15 @@ myci_declare_library(${name}-opengles
9044
PUBLIC_COMPILE_DEFINITIONS
9145
"RUISAPP_RENDER_OPENGLES"
9246
DEPENDENCIES
93-
rasterimage
94-
r4
95-
papki
96-
tml
97-
utki
98-
agg
99-
veg
100-
mikroxml
101-
cssom
102-
svgdom
103-
svgren
10447
nitki
10548
ruis
10649
ruis-render-opengles
107-
EXTERNAL_DEPENDENCIES
108-
JPEG::JPEG
109-
PNG::PNG
110-
Freetype::Freetype
111-
${linux_deps}
112-
${windows_deps}
50+
LINUX_ONLY_DEPENDENCIES
51+
PkgConfig::gdk-3.0
52+
PkgConfig::x11
53+
PkgConfig::egl
54+
WINDOWS_ONLY_DEPENDENCIES
55+
unofficial-angle/unofficial::angle::libEGL
11356
NO_EXPORT
11457
)
11558

@@ -133,8 +76,6 @@ myci_declare_application(${name}-opengl-test
13376
RESOURCE_DIRECTORY
13477
../../tests/app/res
13578
DEPENDENCIES
136-
ruis
137-
nitki
13879
ruisapp::ruisapp-opengl
13980
)
14081

@@ -145,9 +86,5 @@ myci_declare_application(${name}-opengles-test
14586
RESOURCE_DIRECTORY
14687
../../tests/app/res
14788
DEPENDENCIES
148-
ruis
149-
nitki
15089
ruisapp::ruisapp-opengles
151-
EXTERNAL_DEPENDENCIES
152-
${windows_deps}
15390
)

‎build/vcpkg/test/CMakeLists.txt‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,9 @@ 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(opros CONFIG REQUIRED)
19-
find_package(nitki CONFIG REQUIRED)
20-
find_package(ruis CONFIG REQUIRED)
21-
find_package(ruis-render-opengl CONFIG REQUIRED)
22-
23-
find_package(Freetype CONFIG REQUIRED)
24-
find_package(ZLIB REQUIRED)
25-
find_package(JPEG REQUIRED)
26-
find_package(PNG REQUIRED)
27-
find_package(GLEW REQUIRED)
28-
297
if(LINUX)
30-
find_package(PkgConfig REQUIRED)
31-
pkg_check_modules(GDK3 REQUIRED IMPORTED_TARGET "gdk-3.0")
32-
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET "x11")
33-
pkg_check_modules(EGL REQUIRED IMPORTED_TARGET "egl")
34-
pkg_check_modules(GLES2 REQUIRED IMPORTED_TARGET "glesv2")
358
set(win32)
369
elseif(WIN32)
37-
find_package(unofficial-angle CONFIG REQUIRED)
3810
set(win32 WIN32)
3911
endif()
4012

‎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": "165e78b3ccb13ebecfc9f9c368515091e7dbbf9e",
11+
"baseline": "28eed62b45660b7cdeb145dcca44d416ac9b921e",
1212
"reference": "main",
1313
"packages": [
1414
"myci",

‎build/vcpkg/usage‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,5 @@
11
ruisapp 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(opros CONFIG REQUIRED)
15-
find_package(nitki CONFIG REQUIRED)
16-
find_package(ruis CONFIG REQUIRED)
17-
find_package(ruis-render-opengl CONFIG REQUIRED)
18-
19-
find_package(Freetype CONFIG REQUIRED)
20-
find_package(ZLIB REQUIRED)
21-
find_package(JPEG REQUIRED)
22-
find_package(PNG REQUIRED)
23-
find_package(GLEW REQUIRED)
24-
25-
if(LINUX)
26-
find_package(PkgConfig REQUIRED)
27-
pkg_check_modules(GDK3 REQUIRED IMPORTED_TARGET "gdk-3.0")
28-
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET "x11")
29-
pkg_check_modules(EGL REQUIRED IMPORTED_TARGET "egl")
30-
pkg_check_modules(GLES2 REQUIRED IMPORTED_TARGET "glesv2")
31-
elseif(WIN32)
32-
find_package(unofficial-angle CONFIG REQUIRED)
33-
endif()
34-
353
find_package(ruisapp CONFIG REQUIRED)
364

375
target_link_libraries(app-opengl PRIVATE ruisapp::ruisapp-opengl)

‎wiki/Installation.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/EnableRepo.adoc[this manual]
55
. Install package
66
+
7+
- **vcpkg** (Linux, Windows): `{package_name}`
78
- **deb** (Linux): `lib{package_name}-dev`
89
- **homebrew** (MacOS X): `lib{package_name}`
910
- **Android**: `io.github.cppfw:{package_name}`
1011
- **cocoapods** (iOS): `{package_name}`
1112
- **Msys2** (Windows): `mingw-w64-i686-{package_name}`, `mingw-w64-x86_64-{package_name}`
12-
- **Nuget** (Windows, Visual Studio): `lib{package_name}`
13+
- **Nuget** DEPRECATED: use vcpkg instead. (Windows, Visual Studio): `lib{package_name}`

0 commit comments

Comments
 (0)