Fix Windows CI app build path for Ninja/Conan layout
Some checks failed
Windows Release / windows-x86_64 (push) Has been cancelled
Some checks failed
Windows Release / windows-x86_64 (push) Has been cancelled
Conan installs generators under build/Release with Ninja; use conan-release presets and that conanbuild.bat instead of build/.
This commit is contained in:
parent
1c1d63f376
commit
fea392b65d
1 changed files with 6 additions and 6 deletions
12
.github/workflows/windows_release.yml
vendored
12
.github/workflows/windows_release.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue