commit 11850d5f618f2e39ad80fedb42feafa9047330b7
author Marek Gilbert <mcg@google.com> Wed Jan 03 23:07:58 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Jan 04 16:30:54 2018 +0000
tree fe0d2f161f3a77fc1d8ecd39e030b79d39fac507
parent 915c121bb5d424e09bf05c3aabf172a44e958e28

Rename all googletest CMake targets

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>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95e2590..7862307 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -355,8 +355,8 @@
 
 # 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)
 

crypto/CMakeLists.txt

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 640f206..469838a 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -267,11 +267,11 @@
   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()

crypto/test/CMakeLists.txt

diff --git a/crypto/test/CMakeLists.txt b/crypto/test/CMakeLists.txt
index 8857913..46a40f8 100644
--- a/crypto/test/CMakeLists.txt
+++ b/crypto/test/CMakeLists.txt
@@ -9,7 +9,7 @@
 )
 
 add_library(
-  gtest_main
+  boringssl_gtest_main
 
   OBJECT
 

decrepit/CMakeLists.txt

diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
index 34707fd..80e6518 100644
--- a/decrepit/CMakeLists.txt
+++ b/decrepit/CMakeLists.txt
@@ -44,11 +44,11 @@
   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()

ssl/CMakeLists.txt

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 912327b..35288e1 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -49,11 +49,11 @@
   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()