From fea392b65d8f64551dfdee410366256dd97bff1b Mon Sep 17 00:00:00 2001 From: copilot Date: Sun, 25 Oct 2026 19:21:15 +0100 Subject: [PATCH] Fix Windows CI app build path for Ninja/Conan layout Conan installs generators under build/Release with Ninja; use conan-release presets and that conanbuild.bat instead of build/. --- .github/workflows/windows_release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml index b169de3..b35c397 100644 --- a/.github/workflows/windows_release.yml +++ b/.github/workflows/windows_release.yml @@ -91,14 +91,14 @@ jobs: if errorlevel 1 exit /b 1 conan install . -of=build-x86_64 --build=missing -pr:h=win-ci -pr:b=default if errorlevel 1 exit /b 1 - if not exist build-x86_64\build mkdir build-x86_64\build - cd build-x86_64\build - call .\generators\conanbuild.bat - cmake ..\.. -G Ninja -DCMAKE_TOOLCHAIN_FILE="generators\conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release -DCONFIG_NEXT_TO_EXECUTABLE=OFF + rem Ninja + cmake_layout puts generators under build/Release/generators + call build-x86_64\build\Release\generators\conanbuild.bat if errorlevel 1 exit /b 1 - cmake --build . --config Release + cmake --preset conan-release -DCONFIG_NEXT_TO_EXECUTABLE=OFF if errorlevel 1 exit /b 1 - call .\generators\deactivate_conanbuild.bat + cmake --build --preset conan-release + if errorlevel 1 exit /b 1 + call build-x86_64\build\Release\generators\deactivate_conanbuild.bat - name: Package portable zip id: pkg