From 4a7bff0d37ea5a9e191b7cfa6178b6531eb84b42 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Fri, 20 Sep 2024 12:13:27 -0400 Subject: [PATCH] Modified stdcxx to work with windows --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcaa8736..36e2ccc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,7 @@ jobs: conan_compiler: Visual Studio conan_compiler_version: 17 conan_compiler_runtime: --settings compiler.runtime=MD + conan_compiler_libcxx: '' conan_package_manager: '' artifact_suffix: windows-x64 - name: linux64_gcc @@ -53,7 +54,7 @@ jobs: conan_arch: x86_64 conan_compiler: gcc conan_compiler_version: 11 - conan_compiler_libcxx: libstdc++ + conan_compiler_libcxx: --settings compiler.libcxx=libstdc++ conan_compiler_runtime: '' conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True artifact_suffix: linux-x64 @@ -70,8 +71,8 @@ jobs: qt_tools: '' conan_arch: x86_64 conan_compiler: clang - conan_compiler_libcxx: libstdc++ conan_compiler_version: 17 + conan_compiler_libcxx: --settings compiler.libcxx=libstdc++ conan_compiler_runtime: '' conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True artifact_suffix: linux-clang-x64 @@ -136,7 +137,7 @@ jobs: --settings build_type=${{ matrix.build_type }} ` --settings compiler="${{ matrix.conan_compiler }}" ` --settings compiler.version=${{ matrix.conan_compiler_version }} ` - --settings compiler.libcxx=${{ matrix.conan_compiler_libcxx }} ` + ${{ matrix.conan_compiler_libcxx }} ` ${{ matrix.conan_compiler_runtime }} ` ${{ matrix.conan_package_manager }}