diff options
author | Abseil Team <absl-team@google.com> | 2019-04-04 08:13:57 -0700 |
---|---|---|
committer | Gennadiy Rozental <rogeeff@google.com> | 2019-04-04 16:07:58 -0400 |
commit | 666fc1266bccfd8e6eaaa084e7b42580bb8eb199 (patch) | |
tree | 9a9366d8846fb3905f3f224d0e90b9de9d5f730b /CMake/Googletest | |
parent | 93dfcf74cb5fccae3da07897d8613ae6cab958a0 (diff) |
Export of internal Abseil changes.
--
bc89d3221e3927d08881d75eeee0e8db862300fa by Benjamin Barenblat <bbaren@google.com>:
Clean up C-style casts in `ABSL_ASSERT`
PiperOrigin-RevId: 241932756
--
17482daae4b3e2fc725b759586590ac466b72a1e by Jon Cohen <cohenjon@google.com>:
Move Gtest-specific CMake code to its own directory
PiperOrigin-RevId: 241920192
--
9ae52b4f665625352c0a789cff884bde492c28f5 by CJ Johnson <johnsoncj@google.com>:
Moves private data methods from InlinedVector to InlinedVector Storage in anticipation of migrating the Rep union type
PiperOrigin-RevId: 241794144
--
95315bc50a61a0aae4f171b44c2312158a43e72e by Jon Cohen <cohenjon@google.com>:
Use /DNOMINMAX in Abseil tests. This offsets inlcudes of <windows.h> from gtest.
PiperOrigin-RevId: 241790584
--
ee505c7f2ab99d29c165ea21a07190474f64053d by CJ Johnson <johnsoncj@google.com>:
Adds inlined_vector_internal to the deps of inlined_vector in CMakeLists.txt
PiperOrigin-RevId: 241775332
--
94eb5165b49bab59ce7de143be38a4581d5658da by CJ Johnson <johnsoncj@google.com>:
Migrates InlinedVector Storage to class Metadata for compatibility with the eventual member-wise migration to the new exception safe implementation
PiperOrigin-RevId: 241633420
--
f99e172caad1ec8b35bf7bbabaf2833d55a6f055 by Abseil Team <absl-team@google.com>:
Add MSVC specific linker flags only to MSVC builds.
PiperOrigin-RevId: 241615711
--
3ad19d2779281e945bdf56643dc5cee3f730eb4f by Abseil Team <absl-team@google.com>:
Add a comment about per-process randomization of absl::Hash.
PiperOrigin-RevId: 241583697
--
8dfb02d725fee3528351b2da4ed32a7455f9858a by Tom Manshreck <shreck@google.com>:
Internal change
PiperOrigin-RevId: 241564734
GitOrigin-RevId: bc89d3221e3927d08881d75eeee0e8db862300fa
Change-Id: Ibad3da416d08a96ec1f8313f8b519b4270b7e01a
Diffstat (limited to 'CMake/Googletest')
-rw-r--r-- | CMake/Googletest/CMakeLists.txt.in | 15 | ||||
-rw-r--r-- | CMake/Googletest/DownloadGTest.cmake | 32 |
2 files changed, 47 insertions, 0 deletions
diff --git a/CMake/Googletest/CMakeLists.txt.in b/CMake/Googletest/CMakeLists.txt.in new file mode 100644 index 00000000..d60a33e9 --- /dev/null +++ b/CMake/Googletest/CMakeLists.txt.in @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 2.8.2) + +project(googletest-download NONE) + +include(ExternalProject) +ExternalProject_Add(googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG master + SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" + BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +)
\ No newline at end of file diff --git a/CMake/Googletest/DownloadGTest.cmake b/CMake/Googletest/DownloadGTest.cmake new file mode 100644 index 00000000..3c682aef --- /dev/null +++ b/CMake/Googletest/DownloadGTest.cmake @@ -0,0 +1,32 @@ +# Downloads and unpacks googletest at configure time. Based on the instructions +# at https://github.com/google/googletest/tree/master/googletest#incorporating-into-an-existing-cmake-project + +# Download the latest googletest from Github master +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in + ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt +) + +# Configure and build the downloaded googletest source +execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) +if(result) + message(FATAL_ERROR "CMake step for googletest failed: ${result}") +endif() + +execute_process(COMMAND ${CMAKE_COMMAND} --build . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download) +if(result) + message(FATAL_ERROR "Build step for googletest failed: ${result}") +endif() + +# Prevent overriding the parent project's compiler/linker settings on Windows +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + +# Add googletest directly to our build. This defines the gtest and gtest_main +# targets. +add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src + ${CMAKE_BINARY_DIR}/googletest-build + EXCLUDE_FROM_ALL) |