Skip to content

Commit aaa30ce

Browse files
author
Mikolaj Malecki
committed
Added fixes for Google Test reported by AppVeyor
1 parent d5f1c07 commit aaa30ce

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,11 @@ if (ENABLE_UNITTESTS)
16821682

16831683
set_tests_properties(${tests_srt} PROPERTIES RUN_SERIAL TRUE)
16841684
if (ENABLE_UNITTESTS_DISCOVERY)
1685-
gtest_discover_tests(test-srt)
1685+
if (NOT COMMAND gtest_discover_tests)
1686+
message(WARNING "No command gtest_discover_tests provided by GTtest; no test discovery")
1687+
else ()
1688+
gtest_discover_tests(test-srt)
1689+
endif()
16861690
endif()
16871691

16881692
enable_testing()

scripts/googletest-download.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# code copied from https://crascit.com/2015/07/25/cmake-gtest/
2-
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
2+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
33

4-
project(googletest-download NONE)
4+
project(GOOGLETEST_DOWNLOAD)
55

66
include(ExternalProject)
77

0 commit comments

Comments
 (0)