Skip to content

Commit ceb0c10

Browse files
MariusBgmMariusBgm
authored
cmake: add distrib preset for building release packages (#244)
have all cmake options needed for distributions packages bundled in the distrib preset. While at it, remove all the unnecessary presets, we now have: $ cmake --list-presets Available configure presets: "distrib" "debug" "release" "relwithdebinfo" "x86-debug" "x86-release" "x86-relwithdebinfo" "vs141-x86-debug" "vs141-x64-debug" "x-cross-armeabihf-debug" "x-cross-armeabi-debug" "x-cross-qnx-x86_64" "x-cross-qnx-armv7" "x-cross-qnx-aarch64"
1 parent ad6c78b commit ceb0c10

File tree

15 files changed

+121
-581
lines changed

15 files changed

+121
-581
lines changed

‎.github/ISSUE_TEMPLATE/new-issue.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!--
2-
SPDX-FileCopyrightText: 2023 Vector Informatik GmbH
3-
4-
SPDX-License-Identifier: MIT
5-
-->
61

72
---
83
name: New Issue

‎.github/actions/build-cmake-preset/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ runs:
5656
- name: Build ${{ inputs.preset-name }}
5757
run: |
5858
export PATH=${{ inputs.extra-path }}$PATH
59-
cmake --build --preset ${{ inputs.preset-name }}
59+
cmake --build --preset ${{ inputs.preset-name }} --verbose
6060
6161
shell: ${{ inputs.shell }}
6262

‎.github/workflows/build-linux-arm64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
submodules: true
2828
- uses: ./.github/actions/build-cmake-preset
2929
with:
30-
preset-name: linux-release
30+
preset-name: release
3131
cmake-args: "-DCMAKE_C_COMPILER=${{ matrix.toolchain.cc }} \
3232
-DCMAKE_CXX_COMPILER=${{ matrix.toolchain.cxx }}"
3333
artifact-label: ${{ github.job }}

‎.github/workflows/build-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
submodules: true
2828
- uses: ./.github/actions/build-cmake-preset
2929
with:
30-
preset-name: linux-release
30+
preset-name: release
3131
cmake-args: "-DCMAKE_C_COMPILER=${{ matrix.toolchain.cc }} \
3232
-DCMAKE_CXX_COMPILER=${{ matrix.toolchain.cxx }}"
3333
artifact-label: "${{ github.job }}-${{ matrix.toolchain.cc }}"

‎.github/workflows/build-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525

2626
- uses: ./.github/actions/build-cmake-preset
2727
with:
28-
preset-name: clang-release
28+
preset-name: release
2929
artifact-label: ${{ github.job }}

‎.github/workflows/build-mingw64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- uses: ./.github/actions/build-cmake-preset
4040
with:
41-
preset-name: gcc-release
41+
preset-name: release
4242
artifact-label: ${{ github.job }}-${{ matrix.builds.arch }}
4343
cmake-args: -D SILKIT_BUILD_DOCS=OFF -D SILKIT_USE_SYSTEM_LIBRARIES=ON -D SILKIT_BUILD_DASHBOARD=OFF
4444
extra-path: "${{ matrix.builds.bin }}:"

‎.github/workflows/build-win.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- uses: ./.github/actions/build-cmake-preset
5252
with:
53-
preset-name: x64-release
53+
preset-name: release
5454
build-arch: x64
5555
artifact-label: ${{ github.job }}
5656

‎.github/workflows/linux-asan.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ jobs:
2121
submodules: true
2222
- uses: ./.github/actions/build-cmake-preset
2323
with:
24-
preset-name: clang-relwithdebinfo
25-
cmake-args: "-D SILKIT_ENABLE_ASAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \
24+
preset-name: relwithdebinfo
25+
cmake-args: "-D SILKIT_BUILD_DASHBOARD=OFF \
2626
-DCMAKE_C_COMPILER=clang-18 \
27-
-DCMAKE_CXX_COMPILER=clang++-18"
27+
-DCMAKE_CXX_COMPILER=clang++-18 \
28+
-DCMAKE_CXX_FLAGS='-fsanitize=address -fno-omit-frame-pointer' \
29+
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-Og -g3'"
2830
artifact-label: ${{ github.job }}

‎.github/workflows/linux-tsan.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ jobs:
2323
submodules: true
2424
- uses: ./.github/actions/build-cmake-preset
2525
with:
26-
preset-name: clang-relwithdebinfo
27-
cmake-args: "-D SILKIT_ENABLE_THREADSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \
26+
preset-name: relwithdebinfo
27+
cmake-args: "-D SILKIT_BUILD_DASHBOARD=OFF \
2828
-DCMAKE_C_COMPILER=clang-18 \
29-
-DCMAKE_CXX_COMPILER=clang++-18"
29+
-DCMAKE_CXX_COMPILER=clang++-18 \
30+
-DCMAKE_CXX_FLAGS='-fsanitize=thread -fno-omit-frame-pointer' \
31+
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-Og -g3'"
3032
artifact-label: ${{ github.job }}

‎.github/workflows/linux-ubsan.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ jobs:
2222
submodules: true
2323
- uses: ./.github/actions/build-cmake-preset
2424
with:
25-
preset-name: clang-relwithdebinfo
26-
cmake-args: "-D SILKIT_ENABLE_UBSAN=ON -D SILKIT_BUILD_DASHBOARD=OFF \
25+
preset-name: relwithdebinfo
26+
cmake-args: "-D SILKIT_BUILD_DASHBOARD=OFF \
2727
-DCMAKE_C_COMPILER=clang-18 \
28-
-DCMAKE_CXX_COMPILER=clang++-18"
28+
-DCMAKE_CXX_COMPILER=clang++-18 \
29+
-DCMAKE_CXX_FLAGS='-fsanitize=undefined -fno-omit-frame-pointer' \
30+
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-Og -g3'"
2931
artifact-label: ${{ github.job }}

0 commit comments

Comments
 (0)