diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 7b47a5e..6fb0adf 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -32,7 +32,7 @@ jobs: set -eu conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force cd /mnt/source - conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" --build=missing + conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" -o "${{ matrix.option_shared }}" --build=missing cmake -S . -B build/${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} cmake --build build/${{ matrix.build_type }} cmake --build build/${{ matrix.build_type }} --target install @@ -74,7 +74,7 @@ jobs: conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force - name: Build run: | - conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" --build=missing + conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" -o "${{ matrix.option_shared }}" --build=missing cmake -S . -B build "-DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW cmake --build build --config ${{ matrix.build_type }} cmake --build build --config ${{ matrix.build_type }} --target install