Skip to content

Commit 64e938d

Browse files
committed
fixed failing CI build
1 parent 09dbf79 commit 64e938d

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

.github/workflows/run-tests-macos-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: Configure CMake Project
1919
working-directory: ${{github.workspace}}
20-
run: cmake -B build -G "Unix Makefiles" .
20+
run: cmake -DCMAKE_BUILD_TYPE=Debug -B build -G "Unix Makefiles" .
2121

2222
- name: Run tests
2323
working-directory: ${{github.workspace}}/build

fetch-GoogleTest.cmake

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ set(googletest_DOWNLOAD_URL "${googletest_GIT_REPO}/archive/refs/tags/${googlete
4343
set(googletest_DOWNLOAD_URL_HASH "SHA256=ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632" CACHE STRING "googletest download url hash" FORCE)
4444

4545
FetchContent_Declare(googletest
46+
EXCLUDE_FROM_ALL
4647
URL "${googletest_DOWNLOAD_URL}"
4748
URL_HASH "${googletest_DOWNLOAD_URL_HASH}"
4849
DOWNLOAD_EXTRACT_TIMESTAMP true
@@ -56,23 +57,17 @@ FetchContent_Declare(googletest
5657

5758
FetchContent_GetProperties(googletest)
5859

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-
7160
# Prevent overriding the parent project's compiler/linker settings on Windows
7261
set(gtest_force_shared_crt ON CACHE BOOL "Set by re-cmake" FORCE)
7362

7463
# Do not install GoogleTest!
7564
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" OFF)
7665

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+
7772
# 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

Comments
 (0)