From 5e10cdd6b43841b9ba174dc167e141e0df9fc5e1 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 26 May 2025 09:41:04 -0500 Subject: [PATCH] Rename Windows Conan profile --- .github/workflows/ci.yml | 4 ++-- .../{scwx-win64_msvc2022 => scwx-windows_msvc2022_x64} | 0 tools/configure-environment.bat | 2 +- tools/setup-debug-msvc2022.bat | 2 +- tools/setup-debug-ninja.bat | 2 +- tools/setup-multi-msvc2022.bat | 2 +- tools/setup-multi-ninja.bat | 2 +- tools/setup-release-msvc2022.bat | 2 +- tools/setup-release-ninja.bat | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename tools/conan/profiles/{scwx-win64_msvc2022 => scwx-windows_msvc2022_x64} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad80a89f..f8bd4ca2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: include: - - name: win64_msvc2022 + - name: windows_msvc2022_x64 os: windows-2022 build_type: Release env_cc: '' @@ -34,7 +34,7 @@ jobs: qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_tools: '' conan_package_manager: '' - conan_profile: scwx-win64_msvc2022 + conan_profile: scwx-windows_msvc2022_x64 appimage_arch: '' artifact_suffix: windows-x64 - name: linux_gcc_x64 diff --git a/tools/conan/profiles/scwx-win64_msvc2022 b/tools/conan/profiles/scwx-windows_msvc2022_x64 similarity index 100% rename from tools/conan/profiles/scwx-win64_msvc2022 rename to tools/conan/profiles/scwx-windows_msvc2022_x64 diff --git a/tools/configure-environment.bat b/tools/configure-environment.bat index caecbe33..043c84f7 100644 --- a/tools/configure-environment.bat +++ b/tools/configure-environment.bat @@ -11,7 +11,7 @@ :: Conan profiles @set profile_count=1 @set /a last_profile=profile_count - 1 -@set conan_profile[0]=scwx-win64_msvc2022 +@set conan_profile[0]=scwx-windows_msvc2022_x64 :: Install Conan profiles @for /L %%i in (0,1,!last_profile!) do @( diff --git a/tools/setup-debug-msvc2022.bat b/tools/setup-debug-msvc2022.bat index 1aba72b1..8b85f18f 100644 --- a/tools/setup-debug-msvc2022.bat +++ b/tools/setup-debug-msvc2022.bat @@ -2,7 +2,7 @@ @set build_dir=%script_dir%\..\build-debug-msvc2022 @set build_type=Debug -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Visual Studio 17 2022 @set qt_base=C:/Qt @set qt_arch=msvc2022_64 diff --git a/tools/setup-debug-ninja.bat b/tools/setup-debug-ninja.bat index 4e488bd2..c7fcfa3c 100644 --- a/tools/setup-debug-ninja.bat +++ b/tools/setup-debug-ninja.bat @@ -2,7 +2,7 @@ @set build_dir=%script_dir%\..\build-debug-ninja @set build_type=Debug -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Ninja @set qt_base=C:/Qt @set qt_arch=msvc2022_64 diff --git a/tools/setup-multi-msvc2022.bat b/tools/setup-multi-msvc2022.bat index ea54091f..dac9c528 100644 --- a/tools/setup-multi-msvc2022.bat +++ b/tools/setup-multi-msvc2022.bat @@ -1,7 +1,7 @@ @set script_dir=%~dp0 @set build_dir=%script_dir%\..\build-msvc2022 -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Visual Studio 17 2022 @set qt_base=C:/Qt @set qt_arch=msvc2022_64 diff --git a/tools/setup-multi-ninja.bat b/tools/setup-multi-ninja.bat index 9e2565e6..fe0f8008 100644 --- a/tools/setup-multi-ninja.bat +++ b/tools/setup-multi-ninja.bat @@ -1,7 +1,7 @@ @set script_dir=%~dp0 @set build_dir=%script_dir%\..\build-ninja -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Ninja Multi-Config @set qt_base=C:/Qt @set qt_arch=msvc2022_64 diff --git a/tools/setup-release-msvc2022.bat b/tools/setup-release-msvc2022.bat index 3a988f56..5e3621ca 100644 --- a/tools/setup-release-msvc2022.bat +++ b/tools/setup-release-msvc2022.bat @@ -2,7 +2,7 @@ @set build_dir=%script_dir%\..\build-release-msvc2022 @set build_type=Release -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Visual Studio 17 2022 @set qt_base=C:/Qt @set qt_arch=msvc2022_64 diff --git a/tools/setup-release-ninja.bat b/tools/setup-release-ninja.bat index 667721d5..2160562c 100644 --- a/tools/setup-release-ninja.bat +++ b/tools/setup-release-ninja.bat @@ -2,7 +2,7 @@ @set build_dir=%script_dir%\..\build-release-ninja @set build_type=Release -@set conan_profile=scwx-win64_msvc2022 +@set conan_profile=scwx-windows_msvc2022_x64 @set generator=Ninja @set qt_base=C:/Qt @set qt_arch=msvc2022_64