Skip to content

CMake cleanup. #384

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

Merged
David Chisnall (davidchisnall) merged 14 commits into from
Sep 3, 2021
Merged

CMake cleanup. #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e660691
CMake cleanup.
davidchisnall Sep 1, 2021
9a6a762
Fix on cmake < 3.18 and with gcc.
davidchisnall Sep 1, 2021
60efd1c
Fix on Windows.
davidchisnall Sep 1, 2021
096544e
Use C++17 for CI builds on old Ubuntu.
davidchisnall Sep 1, 2021
226ee28
Also use C++17 for the clang-format builds.
davidchisnall Sep 1, 2021
8ac4448
Fix the build on Windows.
davidchisnall Sep 1, 2021
6b45033
Really prevent linking libstdc++ and hopefully fix CI.
davidchisnall Sep 1, 2021
1977459
Improve how cleanup is exposed in cmake.
davidchisnall Sep 1, 2021
77bdf39
Clean up options a bit.
davidchisnall Sep 1, 2021
1776269
Fix typo, address @mjp41's comments.
davidchisnall Sep 2, 2021
f4ba1e5
Unconditionally include CheckLinkerFlags.
davidchisnall Sep 2, 2021
3ae3702
Don't pass -fno-rtti and -fno-exceptions to clang-cl
davidchisnall Sep 2, 2021
f6cd4a6
Fix CI?
davidchisnall Sep 2, 2021
49bcb72
Don't enable clang-cl Wall and Wextra.
davidchisnall Sep 2, 2021
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
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ jobs:
# Build each combination of OS and release/debug variants
os: [ "ubuntu-latest", "ubuntu-18.04", "macos-11", "macos-10.15", "freebsd-12.2", "freebsd-13.0" ]
build-type: [ Release, Debug ]
extra-cmake-flags: [ " " ]
extra-cmake-flags: [ "" ]
# Modify the complete matrix
include:
# Provide the dependency installation for each platform
- os: "ubuntu-18.04"
dependencies: "sudo apt install ninja-build"
cmake-flags: "-DSNMALLOC_USE_CXX17=ON"
- os: "ubuntu-latest"
dependencies: "sudo apt install ninja-build"
- os: "macos-11"
Expand Down Expand Up @@ -68,7 +69,7 @@ jobs:
- name: Install build dependencies
run: ${{ matrix.dependencies }}
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -G Ninja ${{ matrix.extra-cmake-flags }}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -G Ninja ${{ matrix.cmake-flags }} ${{ matrix.extra-cmake-flags }}
# Build with a nice ninja status line
- name: Build
working-directory: ${{github.workspace}}/build
Expand Down Expand Up @@ -201,7 +202,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build
run: cmake -B ${{github.workspace}}/build -DSNMALLOC_USE_CXX17=ON
- name: Install clang-tidy
run: sudo apt install clang-tidy-9
# Run the clang-format check and error if it generates a diff
Expand All @@ -213,7 +214,7 @@ jobs:
git diff --exit-code
- name: Run clang-tidy
run: |
clang-tidy-9 src/override/malloc.cc -header-filter="`pwd`/*" -warnings-as-errors='*' -export-fixes=tidy.fail -- -std=c++17 -mcx16 -DSNMALLOC_PLATFORM_HAS_GETENTROPY=0
clang-tidy-9 src/override/malloc.cc -header-filter="`pwd`/*" -warnings-as-errors='*' -export-fixes=tidy.fail -- -std=c++17 -mcx16 -DSNMALLOC_PLATFORM_HAS_GETENTROPY=0
if [ -f tidy.fail ] ; then
cat tidy.fail
exit 1
Expand Down
Loading