diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a499de0..263d77e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -1,5 +1,4 @@ name: CMake - on: [push] env: @@ -15,13 +14,13 @@ jobs: include: - os: windows-latest - os: ubuntu-latest - - os: macos-12 + - os: macos-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - run: | - pip3 install wheel conan==2.5.0 + pipx install conan conan --version cmake --version diff --git a/conanfile.py b/conanfile.py index be3aabf..67ffc3d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -19,11 +19,11 @@ class TecmpAppRecipe(ConanFile): # Sources are located in the same place as this recipe, copy them to the recipe exports_sources = "CMakeLists.txt", "src/*" - + package_folder = "../dist" - + def requirements(self): - self.requires("pcapplusplus/23.09") + self.requires("pcapplusplus/25.05") def layout(self): cmake_layout(self) @@ -43,4 +43,3 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() -