From 27d120e7b89560f805c06da15603346069bc09ea Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 7 Mar 2017 13:32:39 -0500 Subject: [PATCH] Cleaner import --- CMakeLists.txt | 2 +- cmake/AddGoogletest.cmake | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6fecd85..14751c8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.4 FATAL_ERROR) project(CLI11 CXX) diff --git a/cmake/AddGoogletest.cmake b/cmake/AddGoogletest.cmake index 20ae2f22..b1f4c18b 100644 --- a/cmake/AddGoogletest.cmake +++ b/cmake/AddGoogletest.cmake @@ -15,7 +15,6 @@ download_project(PROJ googletest ) set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR}) #mark_as_advanced( @@ -47,3 +46,12 @@ macro(add_gtest TESTNAME) add_test(${TESTNAME} ${TESTNAME}) endmacro() +mark_as_advanced( +gmock_build_tests +gtest_build_samples +gtest_build_tests +gtest_disable_pthreads +gtest_force_shared_crt +gtest_hide_internal_symbols +) +