Skip to content

Commit 8e99ff1

Browse files
committed
fix: build pipeline
1 parent d59edb6 commit 8e99ff1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/codeql-analysis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
8686
- name: Build mimalloc (Linux)
8787
run: |
88+
git clone --depth 1 --branch v2.1.7 https://github.com/microsoft/mimalloc.git ${{github.workspace}}/third_party/mimalloc
8889
cd ${{github.workspace}}/third_party/mimalloc
8990
mkdir build && cd build
9091
cmake -G Ninja -DMI_SECURE=ON ..
@@ -93,6 +94,7 @@ jobs:
9394
9495
- name: Build googletest (Linux)
9596
run: |
97+
git clone --depth 1 --branch v1.15.0 https://github.com/google/googletest.git ${{github.workspace}}/third_party/googletest
9698
cd ${{github.workspace}}/third_party/googletest
9799
mkdir build && cd build
98100
cmake -G Ninja -DBUILD_SHARED_LIBS=ON ..

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if(CCACHE_FOUND)
173173
endif(CCACHE_FOUND)
174174

175175
# detect compiler
176-
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
176+
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
177177
# using clang
178178
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
179179
message(FATAL_ERROR "Clang version must be at least 9.0!")
@@ -200,7 +200,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
200200
message(FATAL_ERROR "MSVC is not supported.")
201201
else()
202202
# using a unknown compiler
203-
message(FATAL_ERROR "This Unknown Compiler is not supported.")
203+
message(FATAL_ERROR "Compiler: ${CMAKE_CXX_COMPILER_ID} is not supported.")
204204
endif()
205205

206206
# Using Standard C++-17 (Consider compatibility)

0 commit comments

Comments
 (0)