Skip to content

Commit 00a2c7f

Browse files
unify GTest to vcpkg across all platforms
Signed-off-by: Siddhartha Ganguly <gangulysiddhartha22@gmail.com>
1 parent fa3dcfb commit 00a2c7f

File tree

6 files changed

+7
-36
lines changed

6 files changed

+7
-36
lines changed

src/sdk/tests/CMakeLists.txt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
if (APPLE OR WIN32)
2-
include(FetchContent)
3-
FetchContent_Declare(googletest
4-
GIT_REPOSITORY https://github.com/google/googletest.git
5-
GIT_TAG release-1.12.1)
6-
7-
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
8-
FetchContent_MakeAvailable(googletest)
9-
include(googletest)
10-
else ()
11-
find_package(GTest CONFIG REQUIRED)
12-
include(GoogleTest)
13-
endif ()
1+
find_package(GTest CONFIG REQUIRED)
2+
include(GoogleTest)
143

154
add_subdirectory(unit)
165
add_subdirectory(integration)

src/sdk/tests/integration/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
find_package(GTest CONFIG REQUIRED)
2-
include(GoogleTest)
3-
41
set(TEST_PROJECT_NAME ${PROJECT_NAME}-integration-tests)
52
add_executable(${TEST_PROJECT_NAME}
63
AccountAllowanceApproveTransactionIntegrationTests.cc

src/sdk/tests/unit/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
find_package(GTest CONFIG REQUIRED)
2-
include(GoogleTest)
3-
41
set(TEST_PROJECT_NAME ${PROJECT_NAME}-unit-tests)
52
add_executable(${TEST_PROJECT_NAME}
63
AccountAllowanceApproveTransactionUnitTests.cc

src/tck/tests/CMakeLists.txt

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
# TCK Tests CMakeLists.txt
22
# Sets up Google Test and includes test subdirectories
33

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

10-
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
11-
FetchContent_MakeAvailable(googletest)
12-
include(googletest)
13-
else ()
14-
find_package(GTest CONFIG REQUIRED)
15-
include(GoogleTest)
16-
endif ()
17-
18-
add_subdirectory(unit)
7+
add_subdirectory(unit)

src/tck/tests/unit/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
find_package(httplib CONFIG REQUIRED)
66
find_package(nlohmann_json CONFIG REQUIRED)
7-
find_package(GTest CONFIG REQUIRED)
8-
include(GoogleTest)
97

108
# Set the test executable name
119
set(TCK_TEST_NAME ${PROJECT_NAME}-tck-tests)

vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
"version>=": "0.14.1"
4343
},
4444
{
45-
"name": "gtest"
45+
"name": "gtest",
46+
"version>=": "1.16.0"
4647
}
4748
]
4849
}

0 commit comments

Comments
 (0)