merge(3p/absl): subtree merge of Abseil up to e19260f
... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f
This commit is contained in:
		
							parent
							
								
									cc27324d02
								
							
						
					
					
						commit
						082c006c04
					
				
					 854 changed files with 11260 additions and 5296 deletions
				
			
		|  | @ -3,24 +3,12 @@ cmake_minimum_required(VERSION 2.8.2) | |||
| project(googletest-external NONE) | ||||
| 
 | ||||
| include(ExternalProject) | ||||
| if(${ABSL_USE_GOOGLETEST_HEAD}) | ||||
|   ExternalProject_Add(googletest | ||||
|     GIT_REPOSITORY    https://github.com/google/googletest.git | ||||
|     GIT_TAG           master | ||||
|     SOURCE_DIR        "${absl_gtest_src_dir}" | ||||
|     BINARY_DIR        "${absl_gtest_build_dir}" | ||||
|     CONFIGURE_COMMAND "" | ||||
|     BUILD_COMMAND     "" | ||||
|     INSTALL_COMMAND   "" | ||||
|     TEST_COMMAND      "" | ||||
|   ) | ||||
| else() | ||||
|   ExternalProject_Add(googletest | ||||
|     SOURCE_DIR        "${absl_gtest_src_dir}" | ||||
|     BINARY_DIR        "${absl_gtest_build_dir}" | ||||
|     CONFIGURE_COMMAND "" | ||||
|     BUILD_COMMAND     "" | ||||
|     INSTALL_COMMAND   "" | ||||
|     TEST_COMMAND      "" | ||||
|   ) | ||||
| endif() | ||||
| ExternalProject_Add(googletest | ||||
|   URL               "${absl_gtest_download_url}"  # May be empty | ||||
|   SOURCE_DIR        "${absl_gtest_src_dir}" | ||||
|   BINARY_DIR        "${absl_gtest_build_dir}" | ||||
|   CONFIGURE_COMMAND "" | ||||
|   BUILD_COMMAND     "" | ||||
|   INSTALL_COMMAND   "" | ||||
|   TEST_COMMAND      "" | ||||
| ) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue