yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename all googletest CMake targets

Browse Source 
CMake targets are visible globally but gtest_main has boringssl-specific
behavior that isn't appropriate for general use.

This change makes it possible to use boringssl and abseil-cpp in the
same project (since abseil-cpp expects gtest_main to exist and be useful
for its own tests).

Change-Id: Icc81c11b8bb4b1e21cea7c9fa725b6c082bd5369
Reviewed-on: https://boringssl-review.googlesource.com/24604
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Marek Gilbert 2018-01-03 23:07:58 -08:00 committed by CQ bot account: commit-bot@chromium.org
parent 915c121bb5
commit 11850d5f61
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -355,8 +355,8 @@ endif()
# Add minimal googletest targets. The provided one has many side-effects, and
# googletest has a very straightforward build.
add_library(gtest third_party/googletest/src/gtest-all.cc)
target_include_directories(gtest PRIVATE third_party/googletest)
add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
include_directories(third_party/googletest/include)

4
crypto/CMakeLists.txt
View File

@ -267,11 +267,11 @@ add_executable(
x509v3/v3name_test.cc
$<TARGET_OBJECTS:crypto_test_data>
$<TARGET_OBJECTS:gtest_main>
$<TARGET_OBJECTS:boringssl_gtest_main>
$<TARGET_OBJECTS:test_support>
)
target_link_libraries(crypto_test crypto gtest)
target_link_libraries(crypto_test crypto boringssl_gtest)
if (WIN32)
target_link_libraries(crypto_test ws2_32)
endif()

2
crypto/test/CMakeLists.txt
View File

@ -9,7 +9,7 @@ add_library(
)
add_library(
gtest_main
boringssl_gtest_main
OBJECT

4
decrepit/CMakeLists.txt
View File

@ -44,11 +44,11 @@ add_executable(
ripemd/ripemd_test.cc
cfb/cfb_test.cc
$<TARGET_OBJECTS:gtest_main>
$<TARGET_OBJECTS:boringssl_gtest_main>
$<TARGET_OBJECTS:test_support>
)
target_link_libraries(decrepit_test crypto decrepit gtest)
target_link_libraries(decrepit_test crypto decrepit boringssl_gtest)
if (WIN32)
target_link_libraries(decrepit_test ws2_32)
endif()

4
ssl/CMakeLists.txt
View File

@ -49,11 +49,11 @@ add_executable(
span_test.cc
ssl_test.cc
$<TARGET_OBJECTS:gtest_main>
$<TARGET_OBJECTS:boringssl_gtest_main>
$<TARGET_OBJECTS:test_support>
)
target_link_libraries(ssl_test ssl crypto gtest)
target_link_libraries(ssl_test ssl crypto boringssl_gtest)
if (WIN32)
target_link_libraries(ssl_test ws2_32)
endif()