Skip to content

Commit 9299fb2

Browse files
authored
Fix compatibility with cmake v4.x (#22)
1 parent 4eb7677 commit 9299fb2

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/cmake.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: CMake
2-
32
on: [push]
43

54
env:
@@ -15,13 +14,13 @@ jobs:
1514
include:
1615
- os: windows-latest
1716
- os: ubuntu-latest
18-
- os: macos-12
17+
- os: macos-latest
1918

2019
steps:
2120
- uses: actions/checkout@v4
2221
- uses: actions/setup-python@v5
2322
- run: |
24-
pip3 install wheel conan==2.5.0
23+
pipx install conan
2524
conan --version
2625
cmake --version
2726

conanfile.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ class TecmpAppRecipe(ConanFile):
1919

2020
# Sources are located in the same place as this recipe, copy them to the recipe
2121
exports_sources = "CMakeLists.txt", "src/*"
22-
22+
2323
package_folder = "../dist"
24-
24+
2525
def requirements(self):
26-
self.requires("pcapplusplus/23.09")
26+
self.requires("pcapplusplus/25.05")
2727

2828
def layout(self):
2929
cmake_layout(self)
@@ -43,4 +43,3 @@ def build(self):
4343
def package(self):
4444
cmake = CMake(self)
4545
cmake.install()
46-

0 commit comments

Comments
 (0)