Skip to content

Commit 5094d87

Browse files
committed
cmake: myci
1 parent 91f4999 commit 5094d87

11 files changed

Lines changed: 56 additions & 82 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ jobs:
342342
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
343343
- name: test vcpkg port
344344
run: |
345-
cd vcpkg/test
345+
cd build/vcpkg/test
346346
cmake .
347347
make
348348
./test
@@ -351,10 +351,12 @@ jobs:
351351
uses: actions/upload-artifact@v4
352352
with:
353353
name: vcpkg_logs
354-
path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
354+
path: |
355+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
356+
build/vcpkg/**/*.log
355357
- name: deploy vcpkg port
356358
run: |
357-
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
359+
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
358360
if: startsWith(github.ref, 'refs/tags/')
359361
##### conan - linux #####
360362
conan-linux:
@@ -364,8 +366,8 @@ jobs:
364366
include:
365367
- {os: debian, codename: bookworm, image_owner: }
366368
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
367-
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
368-
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
369+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
370+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
369371
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
370372
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
371373
name: conan - linux | ${{ matrix.image_owner }}

build/cmake/CMakeLists.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
cmake_minimum_required(VERSION 3.20)
2+
3+
set(name agg)
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}/src
14+
)
15+
16+
myci_declare_library(${name}
17+
SOURCES
18+
${srcs}
19+
PUBLIC_INCLUDE_DIRECTORIES
20+
../../src/${name}/include
21+
PRIVATE_INCLUDE_DIRECTORIES
22+
../../src/${name}/include/${name}
23+
INSTALL_INCLUDE_DIRECTORIES
24+
../../src/${name}/include/${name}
25+
)
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: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"default-registry": {
3+
"kind": "git",
4+
"baseline": "5e5d0e1cd7785623065e77eff011afdeec1a3574",
5+
"repository": "https://github.com/microsoft/vcpkg"
6+
},
7+
"registries": [
8+
{
9+
"kind": "git",
10+
"repository": "https://github.com/cppfw/vcpkg-repo/",
11+
"baseline": "ee37b99a01227fddb2e59efa05335f0de2111cdc",
12+
"reference": "main",
13+
"packages": [ "myci" ]
14+
}
15+
],
16+
"overlay-ports": [
17+
"../overlay"
18+
]
19+
}
File renamed without changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
{
1313
"name" : "vcpkg-cmake-config",
1414
"host" : true
15+
},
16+
{
17+
"name" : "myci",
18+
"host" : true
1519
}
1620
]
1721
}

cmake/CMakeLists.txt

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

0 commit comments

Comments
 (0)