diff options
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b1a100eb..dcff8c03 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 .. @@ -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 .. diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f6bbd58..9e65ff48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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!") @@ -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) |