From c9c6f8fc14914ed5da2714f937ba75949e4e770c Mon Sep 17 00:00:00 2001 From: Afonso Mukai Date: Mon, 1 Jul 2024 10:52:23 +0200 Subject: [PATCH 1/2] Add include for ssize_t on clang 15 --- src/h5cpp/core/iterator.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/h5cpp/core/iterator.hpp b/src/h5cpp/core/iterator.hpp index b46a0b7c2d..bfc3090ae7 100644 --- a/src/h5cpp/core/iterator.hpp +++ b/src/h5cpp/core/iterator.hpp @@ -25,6 +25,7 @@ #pragma once #include +#include #include namespace hdf5{ From 94f1292d889c9367ecb6c8845a7b868c3ba7ff6c Mon Sep 17 00:00:00 2001 From: Afonso Mukai Date: Mon, 1 Jul 2024 13:43:22 +0200 Subject: [PATCH 2/2] Replace VS2022 with VS2019 Adapted from https://github.com/pni-libraries/libpninexus/pull/240. --- .github/workflows/cmake-build.yml | 71 +++++++++++++++++++++++++ .github/workflows/conan/profiles/vs2019 | 10 ++++ 2 files changed, 81 insertions(+) create mode 100644 .github/workflows/conan/profiles/vs2019 diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index d02452f50f..b13290fd56 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -102,7 +102,78 @@ jobs: run: | cd build ctest --extra-verbose --no-tests=error + windows-2019: + strategy: + matrix: + shared: [ + "shared", + "static" + ] + boost: [ + "boost", + "stdfs" + ] + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: Add MSVC to PATH + uses: ilammy/msvc-dev-cmd@v1 + - name: Set environment variables + run: | + bash .github/workflows/set_env_vars.sh \ + ${{ matrix.shared }} \ + ${{ matrix.boost }} + - name: Install and configure conan + run: | + python -m pip install --upgrade pip + pip install --upgrade conan==2.0.2 + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2019 \ + -o with_boost=${H5CPP_WITH_BOOST} \ + -o shared=${H5CPP_SHARED} \ + -o *:shared=${H5CPP_SHARED}" + conan profile detect + conan remove -c zlib/* + conan lock create conanfile.py ${CONAN_ARGS} --lockfile-packages --lockfile-out base.lock + conan lock create conanfile.py ${CONAN_ARGS} --build missing + - name: cache conan dependencies + uses: actions/cache@v2 + with: + path: ~/.conan/data + key: conan-vs2019-${{ hashfiles('base.lock') }}-${{ hashFiles('conan.lock') }} + restore-keys: | + conan-vs-2019-${{ hashfiles('base.lock') }} + conan-vs-2019 + - name: install conan dependencies + run: | + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2019 \ + -o with_boost=${H5CPP_WITH_BOOST} \ + -o shared=${H5CPP_SHARED} \ + -o *:shared=${H5CPP_SHARED}" + conan remove -c zlib/* + conan install . ${CONAN_ARGS} \ + --output-folder build \ + --lockfile conan.lock \ + --build missing \ + --update \ + --generator VirtualRunEnv + - name: build with cmake + run: | + CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2019 \ + -o with_boost=${H5CPP_WITH_BOOST} \ + -o shared=${H5CPP_SHARED} \ + -o *:shared=${H5CPP_SHARED}" + conan build . ${CONAN_ARGS} \ + --lockfile conan.lock \ + --output-folder build + - name: run tests + run: | + cd build + .\conanbuildenv-release-x86_64.ps1 + .\conanrunenv-release-x86_64.ps1 + ctest --extra-verbose --no-tests=error --output-on-failure + shell: pwsh windows-2022: + if: false strategy: matrix: shared: [ diff --git a/.github/workflows/conan/profiles/vs2019 b/.github/workflows/conan/profiles/vs2019 new file mode 100644 index 0000000000..ec8c8613ae --- /dev/null +++ b/.github/workflows/conan/profiles/vs2019 @@ -0,0 +1,10 @@ +[settings] +arch=x86_64 +build_type=Release +compiler=msvc +compiler.version=192 +compiler.runtime=dynamic +os=Windows + +[conf] +tools.env.virtualenv:powershell=True