Skip to content

Commit 21c17d5

Browse files
committed
cmake: move to build dir
1 parent 9a47e90 commit 21c17d5

File tree

10 files changed

+39
-72
lines changed

10 files changed

+39
-72
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ jobs:
453453
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
454454
- name: test vcpkg port
455455
run: |
456-
cd vcpkg/test
456+
cd build/vcpkg/test
457457
cmake .
458458
make
459459
./test
@@ -462,10 +462,12 @@ jobs:
462462
uses: actions/upload-artifact@v4
463463
with:
464464
name: vcpkg_logs
465-
path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
465+
path: |
466+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
467+
build/vcpkg/**/*.log
466468
- name: deploy vcpkg port
467469
run: |
468-
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
470+
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
469471
if: startsWith(github.ref, 'refs/tags/')
470472
##### conan - linux #####
471473
conan-linux:

build/cmake/CMakeLists.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
cmake_minimum_required(VERSION 3.20)
2+
3+
set(name cssom)
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+
)

vcpkg/portfile.cmake.in renamed to build/vcpkg/portfile.cmake.in

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()
File renamed without changes.
File renamed without changes.

vcpkg/test/vcpkg-configuration.json renamed to build/vcpkg/test/vcpkg-configuration.json

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": "c59200f40f17e2704dc2c47cc145584eb8bcf757",
11+
"baseline": "1f434a4ba56d13e4600053eb572396c4e162c207",
1212
"reference": "main",
13-
"packages": [ "utki", "papki" ]
13+
"packages": [ "myci", "utki", "papki" ]
1414
}
1515
],
1616
"overlay-ports": [
File renamed without changes.
File renamed without changes.

vcpkg/vcpkg.json.in renamed to build/vcpkg/vcpkg.json.in

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
]

cmake/CMakeLists.txt

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

0 commit comments

Comments
 (0)