Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig
pkgconfig: Unconditionally depend on GTest when using GMock
This commit is contained in:
		
						commit
						50c7822c5f
					
				@ -5,5 +5,6 @@ Name: gmock
 | 
				
			|||||||
Description: GoogleMock (without main() function)
 | 
					Description: GoogleMock (without main() function)
 | 
				
			||||||
Version: @PROJECT_VERSION@
 | 
					Version: @PROJECT_VERSION@
 | 
				
			||||||
URL: https://github.com/google/googletest
 | 
					URL: https://github.com/google/googletest
 | 
				
			||||||
 | 
					Requires: gtest
 | 
				
			||||||
Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@
 | 
					Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@
 | 
				
			||||||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
 | 
					Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
 | 
				
			||||||
 | 
				
			|||||||
@ -5,5 +5,6 @@ Name: gmock_main
 | 
				
			|||||||
Description: GoogleMock (with main() function)
 | 
					Description: GoogleMock (with main() function)
 | 
				
			||||||
Version: @PROJECT_VERSION@
 | 
					Version: @PROJECT_VERSION@
 | 
				
			||||||
URL: https://github.com/google/googletest
 | 
					URL: https://github.com/google/googletest
 | 
				
			||||||
 | 
					Requires: gmock
 | 
				
			||||||
Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@
 | 
					Libs: -L${libdir} -lgmock_main @CMAKE_THREAD_LIBS_INIT@
 | 
				
			||||||
Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
 | 
					Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user