Skip to content

Commit b7580cb

Browse files
committed
cmake: myci
1 parent 6adc698 commit b7580cb

File tree

10 files changed

+50
-84
lines changed

10 files changed

+50
-84
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ jobs:
467467
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
468468
- name: test vcpkg port
469469
run: |
470-
cd vcpkg/test
470+
cd build/vcpkg/test
471471
cmake .
472472
make
473473
./test
@@ -476,10 +476,12 @@ jobs:
476476
uses: actions/upload-artifact@v4
477477
with:
478478
name: vcpkg_logs
479-
path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
479+
path: |
480+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
481+
build/vcpkg/**/*.log
480482
- name: deploy vcpkg port
481483
run: |
482-
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
484+
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
483485
if: startsWith(github.ref, 'refs/tags/')
484486
##### conan - linux #####
485487
conan-linux:

build/cmake/CMakeLists.txt

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
cmake_minimum_required(VERSION 3.20)
2+
3+
set(name svgren)
4+
project(${name})
5+
6+
# !!! find_package must go after project() declaration !!!
7+
# Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
8+
find_package(myci CONFIG REQUIRED)
9+
10+
set(srcs)
11+
myci_add_source_files(srcs
12+
DIRECTORY
13+
../../src/${name}
14+
RECURSIVE
15+
)
16+
17+
myci_declare_library(${name}
18+
SOURCES
19+
${srcs}
20+
PUBLIC_INCLUDE_DIRECTORIES
21+
../../src
22+
INSTALL_INCLUDE_DIRECTORIES
23+
../../src/${name}
24+
DEPENDENCIES
25+
utki
26+
papki
27+
r4
28+
rasterimage
29+
agg
30+
mikroxml
31+
cssom
32+
svgdom
33+
veg
34+
EXTERNAL_DEPENDENCIES
35+
ZLIB
36+
PNG
37+
JPEG
38+
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ vcpkg_from_github(
99
)
1010

1111
vcpkg_cmake_configure(
12-
SOURCE_PATH "${SOURCE_PATH}/cmake"
12+
SOURCE_PATH "${SOURCE_PATH}/build/cmake"
1313
)
1414

1515
vcpkg_cmake_install()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/cppfw/vcpkg-repo/",
11-
"baseline": "8c1a3c72c04bbd733fc6e06198b87b966c788c0f",
11+
"baseline": "1e060074751728c83b8e354169c2ff9b0a43c77f",
1212
"reference": "main",
13-
"packages": [ "utki", "papki", "mikroxml", "cssom", "svgdom", "r4", "rasterimage", "agg", "veg" ]
13+
"packages": [ "myci", "utki", "papki", "mikroxml", "cssom", "svgdom", "r4", "rasterimage", "agg", "veg" ]
1414
}
1515
],
1616
"overlay-ports": [
File renamed without changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"name" : "vcpkg-cmake-config",
1414
"host" : true
1515
},
16+
{
17+
"name" : "myci",
18+
"host" : true
19+
},
1620
"utki",
1721
"svgdom",
1822
"veg"

cmake/CMakeLists.txt

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)