代码拉取完成,页面将自动刷新
--- cmake/AddGoogletest.cmake.orig 2019-05-20 06:23:11.000000000 -0600
+++ cmake/AddGoogletest.cmake 2019-06-08 16:14:13.714272321 -0600
@@ -11,8 +11,6 @@ if (MSYS)
set(gtest_disable_pthreads ON CACHE BOOL "" FORCE)
endif()
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "")
-add_subdirectory("${CLI11_SOURCE_DIR}/extern/googletest" "${CLI11_BINARY_DIR}/extern/googletest" EXCLUDE_FROM_ALL)
-
if(GOOGLE_TEST_INDIVIDUAL)
if(NOT CMAKE_VERSION VERSION_LESS 3.9)
@@ -56,16 +54,6 @@ BUILD_GMOCK
BUILD_GTEST
)
-set_target_properties(gtest gtest_main gmock gmock_main
- PROPERTIES FOLDER "Extern")
-
-foreach(TGT IN ITEMS gtest gtest_main gmock gmock_main)
- get_property(DIR_LIST TARGET ${TGT} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
- foreach(ITEM IN LISTS DIR_LIST)
- set_property(TARGET ${TGT} APPEND PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${ITEM}")
- endforeach()
-endforeach()
-
if(MSVC)
if (MSVC_VERSION GREATER_EQUAL 1900)
target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
--- tests/CMakeLists.txt.orig 2019-05-20 06:23:11.000000000 -0600
+++ tests/CMakeLists.txt 2019-06-08 16:06:45.635074659 -0600
@@ -1,8 +1,3 @@
-if(NOT EXISTS "${CLI11_SOURCE_DIR}/extern/googletest/CMakeLists.txt")
- message(FATAL_ERROR "You have requested tests be built, but googletest is not downloaded. Please run:
- git submodule update --init")
-endif()
-
list(APPEND CMAKE_MODULE_PATH "${CLI11_SOURCE_DIR}/cmake")
# If submodule is available, add sanitizers
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。