Merge pull request #4426 from tamaskenez:cmake_external_absl_re2
PiperOrigin-RevId: 587836393 Change-Id: Ia8895898bd0a826b35dc0ebedd8c76503bc8cd43
This commit is contained in:
		@@ -20,6 +20,15 @@ option(BUILD_GMOCK "Builds the googlemock subproject" ON)
 | 
				
			|||||||
option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
 | 
					option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON)
 | 
				
			||||||
option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF)
 | 
					option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if(GTEST_HAS_ABSL)
 | 
				
			||||||
 | 
					  if(NOT TARGET absl::base)
 | 
				
			||||||
 | 
					    find_package(absl REQUIRED)
 | 
				
			||||||
 | 
					  endif()
 | 
				
			||||||
 | 
					  if(NOT TARGET re2::re2)
 | 
				
			||||||
 | 
					    find_package(re2 REQUIRED)
 | 
				
			||||||
 | 
					  endif()
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(BUILD_GMOCK)
 | 
					if(BUILD_GMOCK)
 | 
				
			||||||
  add_subdirectory( googlemock )
 | 
					  add_subdirectory( googlemock )
 | 
				
			||||||
else()
 | 
					else()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,6 +4,10 @@ if (@GTEST_HAS_PTHREAD@)
 | 
				
			|||||||
  set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
 | 
					  set(THREADS_PREFER_PTHREAD_FLAG @THREADS_PREFER_PTHREAD_FLAG@)
 | 
				
			||||||
  find_dependency(Threads)
 | 
					  find_dependency(Threads)
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					if (@GTEST_HAS_ABSL@)
 | 
				
			||||||
 | 
					  find_dependency(absl)
 | 
				
			||||||
 | 
					  find_dependency(re2)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 | 
					include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 | 
				
			||||||
check_required_components("@project_name@")
 | 
					check_required_components("@project_name@")
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user