Skip to content

Commit

Permalink
update cpm and workflows (#5)
Browse files Browse the repository at this point in the history
Co-authored-by: Artur Bać <artur@ebasoft.com.pl>
  • Loading branch information
arturbac and Artur Bać authored Nov 17, 2024
1 parent 5814ee6 commit 16f5c43
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 228 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ jobs:
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 18
sudo ./llvm.sh 19
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y gcc-14 g++-14 cmake ninja-build clang-18 libfmt-dev libc++-18-dev libc++abi-18-dev
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
sudo apt-get install -y gcc-14 g++-14 cmake ninja-build clang-19 libfmt-dev libc++-19-dev libc++abi-19-dev
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-19 100
- name: tests clang-18-release
run: cmake --workflow --preset="clang-18-release"
- name: tests clang-19-release
run: cmake --workflow --preset="clang-19-release"

- name: tests clang-18-libc++release
run: cmake --workflow --preset="clang-18-libc++release"
- name: tests clang-19-libc++release
run: cmake --workflow --preset="clang-19-libc++release"

- name: tests gcc-14-release
run: cmake --workflow --preset="gcc-14-release"
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ if( PROJECT_IS_TOP_LEVEL AND STRALGO_ENABLE_UNIT_TESTS)
enable_testing()
endif()

include(cmake/CPM.cmake)
include(cmake/get_cpm.cmake)
# ---- Add dependencies via CPM ----
# see https://github.com/cpm-cmake/CPM.cmake for more info
CPMAddPackage(
NAME PackageProject.cmake
GITHUB_REPOSITORY TheLartians/PackageProject.cmake
VERSION 1.11.2
VERSION 1.12.0
)

#----------------------------------------------------------------
Expand All @@ -36,7 +36,7 @@ CPMAddPackage(
CPMAddPackage(
small_vectors
GITHUB_REPOSITORY arturbac/small_vectors
GIT_TAG v3.1.8
GIT_TAG v3.1.9
)

if( PROJECT_IS_TOP_LEVEL )
Expand Down
Loading

0 comments on commit 16f5c43

Please sign in to comment.