Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AQEMU/aqemu
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanAizek committed Mar 15, 2024
2 parents 0f46f4c + de72ee8 commit 968c3f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, macOS-latest, windows-latest]
build_type: [Release]
c_compiler: [gcc, clang, cl]
include:
Expand Down Expand Up @@ -80,6 +80,7 @@ jobs:
run: |
for /f "delims=" %%d in ( 'vswhere.exe -latest -property installationPath' ) do @( call "%%d\VC\Auxiliary\Build\vcvars64.bat" )
IF "%QT_VERSION:~0,1%"=="5" ( dir %Qt5_DIR% ) ELSE ( dir %QT_ROOT_DIR%\lib\cmake )
mkdir ${{ steps.strings.outputs.build-output-dir }}
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
Expand All @@ -97,6 +98,7 @@ jobs:
else
ls "${Qt5_DIR}"
fi
mkdir ${{ steps.strings.outputs.build-output-dir }}
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
Expand Down
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

0 comments on commit 968c3f2

Please sign in to comment.