@@ -43,6 +43,7 @@ set(googletest_DOWNLOAD_URL "${googletest_GIT_REPO}/archive/refs/tags/${googlete
43
43
set (googletest_DOWNLOAD_URL_HASH "SHA256=ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632" CACHE STRING "googletest download url hash" FORCE )
44
44
45
45
FetchContent_Declare (googletest
46
+ EXCLUDE_FROM_ALL
46
47
URL "${googletest_DOWNLOAD_URL} "
47
48
URL_HASH "${googletest_DOWNLOAD_URL_HASH} "
48
49
DOWNLOAD_EXTRACT_TIMESTAMP true
@@ -56,23 +57,17 @@ FetchContent_Declare(googletest
56
57
57
58
FetchContent_GetProperties (googletest )
58
59
59
- if (NOT googletest_POPULATED )
60
-
61
- if (FETCHCONTENT_SOURCE_DIR_GOOGLETEST )
62
- message (STATUS "Using googletest from local ${FETCHCONTENT_SOURCE_DIR_GOOGLETEST} " )
63
- else ()
64
- message (STATUS "Fetching googletest from ${googletest_DOWNLOAD_URL} " )
65
- endif ()
66
-
67
- FetchContent_Populate (googletest )
68
-
69
- endif ()
70
-
71
60
# Prevent overriding the parent project's compiler/linker settings on Windows
72
61
set (gtest_force_shared_crt ON CACHE BOOL "Set by re-cmake" FORCE )
73
62
74
63
# Do not install GoogleTest!
75
64
option (INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF )
76
65
66
+ if (FETCHCONTENT_SOURCE_DIR_GOOGLETEST )
67
+ message (STATUS "Using googletest from local ${FETCHCONTENT_SOURCE_DIR_GOOGLETEST} " )
68
+ else ()
69
+ message (STATUS "Fetching googletest from ${googletest_DOWNLOAD_URL} " )
70
+ endif ()
71
+
77
72
# Add googletest directly to our build. This defines the gtest and gtest_main targets.
78
- add_subdirectory ( ${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL )
73
+ FetchContent_MakeAvailable ( googletest )
0 commit comments