Commit 27d120e7b89560f805c06da15603346069bc09ea

Authored by Henry Schreiner
1 parent 58b25d67

Cleaner import

CMakeLists.txt
1 -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) 1 +cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
2 2
3 project(CLI11 CXX) 3 project(CLI11 CXX)
4 4
cmake/AddGoogletest.cmake
@@ -15,7 +15,6 @@ download_project(PROJ googletest @@ -15,7 +15,6 @@ download_project(PROJ googletest
15 ) 15 )
16 16
17 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) 17 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
18 -  
19 add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR}) 18 add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR})
20 19
21 #mark_as_advanced( 20 #mark_as_advanced(
@@ -47,3 +46,12 @@ macro(add_gtest TESTNAME) @@ -47,3 +46,12 @@ macro(add_gtest TESTNAME)
47 add_test(${TESTNAME} ${TESTNAME}) 46 add_test(${TESTNAME} ${TESTNAME})
48 endmacro() 47 endmacro()
49 48
  49 +mark_as_advanced(
  50 +gmock_build_tests
  51 +gtest_build_samples
  52 +gtest_build_tests
  53 +gtest_disable_pthreads
  54 +gtest_force_shared_crt
  55 +gtest_hide_internal_symbols
  56 +)
  57 +