Skip to content

Commit

Permalink
fix: build pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
saturneric committed Jul 31, 2024
1 parent d59edb6 commit 8e99ff1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
- name: Build mimalloc (Linux)
run: |
git clone --depth 1 --branch v2.1.7 https://github.com/microsoft/mimalloc.git ${{github.workspace}}/third_party/mimalloc
cd ${{github.workspace}}/third_party/mimalloc
mkdir build && cd build
cmake -G Ninja -DMI_SECURE=ON ..
Expand All @@ -93,6 +94,7 @@ jobs:
- name: Build googletest (Linux)
run: |
git clone --depth 1 --branch v1.15.0 https://github.com/google/googletest.git ${{github.workspace}}/third_party/googletest
cd ${{github.workspace}}/third_party/googletest
mkdir build && cd build
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ if(CCACHE_FOUND)
endif(CCACHE_FOUND)

# detect compiler
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
# using clang
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
message(FATAL_ERROR "Clang version must be at least 9.0!")
Expand All @@ -200,7 +200,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
message(FATAL_ERROR "MSVC is not supported.")
else()
# using a unknown compiler
message(FATAL_ERROR "This Unknown Compiler is not supported.")
message(FATAL_ERROR "Compiler: ${CMAKE_CXX_COMPILER_ID} is not supported.")
endif()

# Using Standard C++-17 (Consider compatibility)
Expand Down

0 comments on commit 8e99ff1

Please sign in to comment.