Skip to content

Commit 1b2f660

Browse files
committed
cmake: myci
1 parent 56ab279 commit 1b2f660

10 files changed

Lines changed: 45 additions & 79 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
- {os: ubuntu, codename: noble, image_owner: }
136136
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
137137
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
138-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
138+
# - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
139139
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
140140
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
141141
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -459,7 +459,7 @@ jobs:
459459
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
460460
- name: test vcpkg port
461461
run: |
462-
cd vcpkg/test
462+
cd build/vcpkg/test
463463
cmake .
464464
make
465465
./test
@@ -468,10 +468,12 @@ jobs:
468468
uses: actions/upload-artifact@v4
469469
with:
470470
name: vcpkg_logs
471-
path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
471+
path: |
472+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
473+
build/vcpkg/**/*.log
472474
- name: deploy vcpkg port
473475
run: |
474-
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
476+
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
475477
if: startsWith(github.ref, 'refs/tags/')
476478
##### conan - linux #####
477479
conan-linux:

build/cmake/CMakeLists.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
cmake_minimum_required(VERSION 3.20)
2+
3+
set(name svgdom)
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+
mikroxml
29+
cssom
30+
EXTERNAL_DEPENDENCIES
31+
ZLIB
32+
)
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": "5b31ac3348a90168b82422db42d8104fc4d874c8",
11+
"baseline": "fc91207f55941fa249ee4e1242cbc2158181dcf0",
1212
"reference": "main",
13-
"packages": [ "utki", "papki", "mikroxml", "cssom", "r4" ]
13+
"packages": [ "myci", "utki", "papki", "mikroxml", "cssom", "r4" ]
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
"papki",
1822
"mikroxml",

cmake/CMakeLists.txt

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

0 commit comments

Comments
 (0)