mirror of
https://github.com/mat007/turtle.git
synced 2026-08-20 21:09:46 +00:00
CI: Fix C++ standard handling for CMake build
This commit is contained in:
parent
4caab62ae0
commit
e88fa7db49
1 changed files with 14 additions and 2 deletions
16
.github/workflows/ci.yml
vendored
16
.github/workflows/ci.yml
vendored
|
|
@ -196,9 +196,10 @@ jobs:
|
||||||
echo "LD_LIBRARY_PATH=$PWD/stage/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
echo "LD_LIBRARY_PATH=$PWD/stage/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: CMake build
|
- name: CMake build
|
||||||
|
env:
|
||||||
|
CXX_STD: ${{matrix.cxxstd}}
|
||||||
run: |
|
run: |
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
CXX_STANDARD="${{matrix.cxxstd}}"
|
|
||||||
if [[ "${{matrix.os}}" == "windows-"* ]]; then
|
if [[ "${{matrix.os}}" == "windows-"* ]]; then
|
||||||
extra_args=()
|
extra_args=()
|
||||||
else
|
else
|
||||||
|
|
@ -210,8 +211,19 @@ jobs:
|
||||||
if [[ "${{matrix.generator}}" == "MinGW"* ]]; then
|
if [[ "${{matrix.generator}}" == "MinGW"* ]]; then
|
||||||
extra_args+=(-DCMAKE_CXX_FLAGS="-Wa,-mbig-obj")
|
extra_args+=(-DCMAKE_CXX_FLAGS="-Wa,-mbig-obj")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CXX_STD=${CXX_STD##*,} # Extract last value
|
||||||
|
case "$CXX_STD" in
|
||||||
|
latest) CXX_STD="" ;; # MSVC: Use default
|
||||||
|
# Use older ones instead of aliases
|
||||||
|
2b) CXX_STD=20 ;;
|
||||||
|
2c) CXX_STD=23 ;;
|
||||||
|
esac
|
||||||
|
if [[ -n "$CXX_STD" ]]; then
|
||||||
|
extra_args+=(-DCMAKE_CXX_STANDARD="$CXX_STD")
|
||||||
|
fi
|
||||||
echo "Using extra args: ${extra_args[*]}"
|
echo "Using extra args: ${extra_args[*]}"
|
||||||
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT="$BOOST_ROOT/stage" -DCMAKE_CXX_STANDARD="${CXX_STANDARD##*,}" "${extra_args[@]}" -DCMAKE_VERBOSE_MAKEFILE=ON -DBoost_DEBUG=ON -DBoost_VERBOSE=ON
|
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT="$BOOST_ROOT/stage" "${extra_args[@]}" -DCMAKE_VERBOSE_MAKEFILE=ON -DBoost_DEBUG=ON -DBoost_VERBOSE=ON
|
||||||
cmake --build . --config Debug --parallel 3
|
cmake --build . --config Debug --parallel 3
|
||||||
ctest --output-on-failure --build-config Debug
|
ctest --output-on-failure --build-config Debug
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue