Skip to content

fix: unify GTest to vcpkg across all platforms #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rwalworth merged 1 commit into from
Feb 25, 2026
Merged

fix: unify GTest to vcpkg across all platforms #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/sdk/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
if (APPLE OR WIN32)
include(FetchContent)
FetchContent_Declare(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.12.1)

set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)
include(googletest)
else ()
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)
endif ()
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)

add_subdirectory(unit)
add_subdirectory(integration)
3 changes: 0 additions & 3 deletions src/sdk/tests/integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)

set(TEST_PROJECT_NAME ${PROJECT_NAME}-integration-tests)
add_executable(${TEST_PROJECT_NAME}
AccountAllowanceApproveTransactionIntegrationTests.cc
Expand Down
3 changes: 0 additions & 3 deletions src/sdk/tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)

set(TEST_PROJECT_NAME ${PROJECT_NAME}-unit-tests)
add_executable(${TEST_PROJECT_NAME}
AccountAllowanceApproveTransactionUnitTests.cc
Expand Down
17 changes: 3 additions & 14 deletions src/tck/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
# TCK Tests CMakeLists.txt
# Sets up Google Test and includes test subdirectories

if (APPLE OR WIN32)
include(FetchContent)
FetchContent_Declare(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.12.1)
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)

set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)
include(googletest)
else ()
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)
endif ()

add_subdirectory(unit)
add_subdirectory(unit)
2 changes: 0 additions & 2 deletions src/tck/tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

find_package(httplib CONFIG REQUIRED)
find_package(nlohmann_json CONFIG REQUIRED)
find_package(GTest CONFIG REQUIRED)
include(GoogleTest)

# Set the test executable name
set(TCK_TEST_NAME ${PROJECT_NAME}-tck-tests)
Expand Down
3 changes: 2 additions & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"version>=": "0.14.1"
},
{
"name": "gtest"
"name": "gtest",
"version>=": "1.16.0"
}
]
}
Loading