Skip to content

CI: Use MSVC generator #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

CI: Use MSVC generator #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Windows Conda Packages
if: contains(matrix.os, 'windows')
shell: bash -l {0}
run: conda install m2-bison=3.0.4 ninja
run: conda install m2-bison=3.0.4 ninja cmake=3.22.2

- name: Install Linux / macOS Conda Packages
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
set CONDA_INSTALL_LOCN=C:\\Miniconda
call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
call conda activate test
set LFORTRAN_CMAKE_GENERATOR=Ninja
set LFORTRAN_CMAKE_GENERATOR=Visual Studio 16 2019
set WIN=1
set MACOS=0
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
Expand Down
6 changes: 5 additions & 1 deletion ci/build.xsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ cd test-bld
# compiled in Release mode and we get link failures if we mix and match build
# modes:
BUILD_TYPE = "Release"
cmake --version
cmake -G $LFORTRAN_CMAKE_GENERATOR -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_LLVM=yes -DWITH_XEUS=yes -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DWITH_LFORTRAN_BINARY_MODFILES=no -DCMAKE_BUILD_TYPE=@(BUILD_TYPE) ..
cmake --build . --target install
if $WIN == "1":
cmake --build . --target install --config @(BUILD_TYPE)
else:
cmake --build . --target install
./src/lpython/tests/test_lfortran
./src/bin/lpython < ../src/bin/example_input.txt
ctest --output-on-failure
Expand Down