diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-05-12 16:59:17 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-05-12 16:59:17 -0500 |
| commit | b7ee587ddb38e34b1445ca3b4fde8267f441c376 (patch) | |
| tree | 77ba2178b4c8201ef839732cddd8cbe365dac0bc /tests | |
| parent | Merge pull request #7690 (diff) | |
| parent | cmake: set 3.5 as minimum version (diff) | |
| download | monero-b7ee587ddb38e34b1445ca3b4fde8267f441c376.tar.xz | |
Merge pull request #7691
cbd54ea cmake: set 3.5 as minimum version (selsta)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/gtest/cmake/internal_utils.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/gtest/CMakeLists.txt b/tests/gtest/CMakeLists.txt index 621d0f042..50941b8d8 100644 --- a/tests/gtest/CMakeLists.txt +++ b/tests/gtest/CMakeLists.txt @@ -45,7 +45,7 @@ endif() # ${gtest_BINARY_DIR}. # Language "C" is required for find_package(Threads). project(gtest CXX C) -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 3.5) if (COMMAND set_up_hermetic_build) set_up_hermetic_build() diff --git a/tests/gtest/cmake/internal_utils.cmake b/tests/gtest/cmake/internal_utils.cmake index ae45d7d7a..b33197989 100644 --- a/tests/gtest/cmake/internal_utils.cmake +++ b/tests/gtest/cmake/internal_utils.cmake @@ -96,7 +96,7 @@ macro(config_compiler_and_linker) set(cxx_no_rtti_flags "-fno-rtti -DGTEST_HAS_RTTI=0") set(cxx_strict_flags "-Wextra -Wno-unused-parameter -Wno-missing-field-initializers") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(cxx_base_flags "-Wall -Wshadow -fPIC") set(cxx_exception_flags "-fexceptions") set(cxx_no_exception_flags "-fno-exceptions") |