Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install
Fix problem installing gtest when gmock enabled
This commit is contained in:
		
						commit
						e933b7f1bb
					
				@ -19,10 +19,11 @@ else()
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
option(BUILD_GTEST "Builds the googletest subproject" OFF)
 | 
			
		||||
cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)
 | 
			
		||||
 | 
			
		||||
#Note that googlemock target already builds googletest
 | 
			
		||||
option(BUILD_GMOCK "Builds the googlemock subproject" ON)
 | 
			
		||||
 | 
			
		||||
cmake_dependent_option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON "BUILD_GTEST OR BUILD_GMOCK" OFF)
 | 
			
		||||
cmake_dependent_option(INSTALL_GMOCK "Enable installation of googlemock. (Projects embedding googlemock may want to turn this OFF.)" ON "BUILD_GMOCK" OFF)
 | 
			
		||||
 | 
			
		||||
if(BUILD_GMOCK)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user