80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

CMake: Clean up presets, update the GitHub job to use them

Browse Source
This commit is contained in:
David Hrdlička
2022-07-12 09:08:28 +02:00
parent 30479fc3b9
commit 54e43ad7bc
2 changed files with 198 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
.github/workflows/cmake.yml vendored
View File

@@ -25,7 +25,7 @@ on:
jobs: jobs:
msys2: msys2:
name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }}) name: MSYS2 ${{ matrix.build.name }} ${{ matrix.dynarec.name }} build (${{ matrix.environment.msystem }})
runs-on: windows-2022 runs-on: windows-2022
@@ -37,41 +37,29 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular ODR - name: Debug
# slug: -ODR
# preset: regular
# target: install/strip
- name: Debug ODR
slug: -ODR-Debug
preset: debug preset: debug
target: install slug: -Debug
- name: Dev ODR - name: Dev
slug: -ODR-Dev
preset: experimental preset: experimental
target: install slug: -Dev
# - name: Regular NDR dynarec:
# slug: -NDR - name: ODR
# preset: regularndr new: off
# target: install/strip slug: -ODR
- name: Debug NDR - name: NDR
slug: -NDR-Debug new: on
preset: debugndr slug: -NDR
target: install
- name: Dev NDR
slug: -NDR-Dev
preset: experimentalndr
target: install
environment: environment:
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
toolchain: ./cmake/flags-gcc-i686.cmake
- msystem: MINGW64 - msystem: MINGW64
prefix: mingw-w64-x86_64 prefix: mingw-w64-x86_64
toolchain: ./cmake/flags-gcc-x86_64.cmake
- msystem: UCRT64 - msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64 prefix: mingw-w64-ucrt-x86_64
# - msystem: CLANG32 toolchain: ./cmake/flags-gcc-x86_64.cmake
# prefix: mingw-w64-clang-i686
# - msystem: CLANG64
# prefix: mingw-w64-clang-x86_64
steps: steps:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
@@ -92,15 +80,18 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
--preset ${{ matrix.build.preset }} --toolchain ${{ matrix.environment.toolchain }}
-D NEW_DYNAREC=${{ matrix.dynarec.new }}
-D CMAKE_INSTALL_PREFIX=./build/artifacts -D CMAKE_INSTALL_PREFIX=./build/artifacts
-D QT=OFF -D QT=OFF
- name: Build - name: Build
run: cmake --build build --target ${{ matrix.build.target }} run: cmake --build build
- name: Generate package
run: cmake --install build
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}' name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**
llvm-windows: llvm-windows:
@@ -116,10 +107,10 @@ jobs:
matrix: matrix:
build: build:
- name: Debug - name: Debug
dev: off preset: debug
slug: -Debug slug: -Debug
- name: Dev - name: Dev
dev: on preset: experimental
slug: -Dev slug: -Dev
dynarec: dynarec:
- name: ODR - name: ODR
@@ -178,10 +169,9 @@ jobs:
run: dir "C:/Program Files/Microsoft Visual Studio/2022/*/VC/Tools/MSVC/*/include" -include stdatomic.h -recurse | del run: dir "C:/Program Files/Microsoft Visual Studio/2022/*/VC/Tools/MSVC/*/include" -include stdatomic.h -recurse | del
- name: Configure CMake - name: Configure CMake
run: > run: >
cmake -G Ninja -S . -B build cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-D DEV_BUILD=${{ matrix.build.dev}} -D NEW_DYNAREC=${{ matrix.dynarec.new }} -D QT=${{ matrix.ui.qt }} --toolchain C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-D CMAKE_BUILD_TYPE=Debug -D NEW_DYNAREC=${{ matrix.dynarec.new }} -D QT=${{ matrix.ui.qt }}
-D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }} -D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }}
-D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }} -D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }}
-D VCPKG_HOST_TRIPLET=x64-windows -D VCPKG_HOST_TRIPLET=x64-windows
@@ -204,67 +194,56 @@ jobs:
path: build/artifacts/** path: build/artifacts/**
linux: linux:
name: "Linux GCC 11 (${{ matrix.build.name }} x86_64)" name: "Linux GCC 11 (${{ matrix.build.name }} ${{ matrix.dynarec.name }} x86_64)"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular ODR - name: Debug
# slug: -ODR preset: debug
# type: Release slug: -Debug
# dev-build: off - name: Dev
# new-dynarec: off preset: experimental
# strip: --strip slug: -Dev
- name: Debug ODR dynarec:
slug: -ODR-Debug - name: ODR
type: Debug new: off
dev-build: off slug: -ODR
new-dynarec: off - name: NDR
- name: Dev ODR new: on
slug: -ODR-Dev slug: -NDR
type: Debug
dev-build: on
new-dynarec: off
# - name: Regular NDR
# slug: -NDR
# type: Release
# strip: --strip
# dev-build: off
# new-dynarec: on
- name: Debug NDR
slug: -NDR-Debug
type: Debug
dev-build: off
new-dynarec: on
- name: Dev NDR
slug: -NDR-Dev
type: Debug
dev-build: on
new-dynarec: on
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: sudo apt update && sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libc6-dev librtmidi-dev qtbase5-dev qttools5-dev libfaudio-dev run: >-
sudo apt update && sudo apt install
build-essential
ninja-build
libfreetype-dev
libsdl2-dev
libpng-dev
libc6-dev
librtmidi-dev
qtbase5-dev
qttools5-dev
libfaudio-dev
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-D CMAKE_INSTALL_PREFIX=./build/artifacts --toolchain ./cmake/flags-gcc-x86_64.cmake
-D DEV_BRANCH=${{ matrix.build.dev-build }} -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
-D CMAKE_C_COMPILER=gcc-11 -D CMAKE_CXX_COMPILER=g++-11
- name: Build - name: Build
run: cmake --build build run: cmake --build build
- name: Generate package # - name: Generate package
run: cmake --install build --prefix ./build/artifacts ${{ matrix.build.strip }} # run: cmake --install build --prefix ./build/artifacts
- uses: actions/upload-artifact@v2 # - uses: actions/upload-artifact@v2
with: # with:
name: '86Box${{ matrix.build.slug }}-UbuntuFocal-x86_64-gha${{ github.run_number }}' # name: '86Box${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** # path: build/artifacts/**
macos11: macos11:
name: "macOS 11 (${{ matrix.build.name }} x86_64)" name: "macOS 11 (${{ matrix.build.name }} x86_64)"
@@ -275,56 +254,35 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular ODR - name: Debug
# slug: -ODR preset: debug
# type: Release slug: -Debug
# dev-build: off - name: Dev
# new-dynarec: off preset: experimental
# strip: --strip slug: -Dev
- name: Debug ODR dynarec:
slug: -ODR-Debug - name: ODR
type: Debug new: off
dev-build: off slug: -ODR
new-dynarec: off - name: NDR
- name: Dev ODR new: on
slug: -ODR-Dev slug: -NDR
type: Debug
dev-build: on
new-dynarec: off
# - name: Regular NDR
# slug: -NDR
# type: Release
# strip: --strip
# dev-build: off
# new-dynarec: on
- name: Debug NDR
slug: -NDR-Debug
type: Debug
dev-build: off
new-dynarec: on
- name: Dev NDR
slug: -NDR-Dev
type: Debug
dev-build: on
new-dynarec: on
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: brew install freetype sdl2 libpng rtmidi qt@5 faudio run: brew install freetype sdl2 libpng rtmidi qt@5 faudio ninja
- name: Configure CMake - name: Configure CMake
run: >- run: >-
PATH=/usr/local/opt/qt@5/bin:$PATH PATH=/usr/local/opt/qt@5/bin:$PATH
cmake -S . -B build cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
--toolchain cmake/flags-gcc-x86_64.cmake --toolchain cmake/flags-gcc-x86_64.cmake
-D DEV_BRANCH=${{ matrix.build.dev-build }}
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
-D CMAKE_FIND_ROOT_PATH=/usr/local/opt/qt@5 -D CMAKE_FIND_ROOT_PATH=/usr/local/opt/qt@5
- name: Build - name: Build
run: cmake --build build run: cmake --build build
- name: Generate package - name: Generate package
run: cmake --install build --prefix ./build/artifacts ${{ matrix.build.strip }} run: cmake --install build --prefix ./build/artifacts
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' name: '86Box${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'

75
CMakePresets.json
View File

@@ -2,108 +2,35 @@
"version": 3, "version": 3,
"cmakeMinimumRequired": { "cmakeMinimumRequired": {
"major": 3, "major": 3,
"minor": 21, "minor": 21
"patch": 0
}, },
"configurePresets": [ "configurePresets": [
{
"name": "flags-base",
"cacheVariables": {
"CMAKE_CONFIGURATION_TYPES": "Debug;Release;Optimized"
},
"hidden": true,
"binaryDir": "build"
},
{ {
"name": "regular", "name": "regular",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Release", "CMAKE_BUILD_TYPE": "Release",
"DEV_BRANCH": "OFF", "DEV_BRANCH": "OFF",
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "regularndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "optimized", "name": "optimized",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Optimized", "CMAKE_BUILD_TYPE": "Optimized",
"DEV_BRANCH": "OFF", "DEV_BRANCH": "OFF",
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "optimizedndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Optimized",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "debug", "name": "debug",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "OFF", "DEV_BRANCH": "OFF",
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "debugndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "experimental", "name": "experimental",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "ON",
"NEW_DYNAREC": "OFF"
}
},
{
"name": "experimentalndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "ON", "DEV_BRANCH": "ON",