Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
PiperOrigin-RevId: 217923705
This commit is contained in:
		
						commit
						572050dd28
					
				@ -1,5 +1,6 @@
 | 
			
		||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 | 
			
		||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 | 
			
		||||
prefix=${pcfiledir}/../..
 | 
			
		||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 | 
			
		||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 | 
			
		||||
 | 
			
		||||
Name: gmock
 | 
			
		||||
Description: GoogleMock (without main() function)
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,6 @@
 | 
			
		||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 | 
			
		||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 | 
			
		||||
prefix=${pcfiledir}/../..
 | 
			
		||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 | 
			
		||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 | 
			
		||||
 | 
			
		||||
Name: gmock_main
 | 
			
		||||
Description: GoogleMock (with main() function)
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,6 @@
 | 
			
		||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 | 
			
		||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 | 
			
		||||
prefix=${pcfiledir}/../..
 | 
			
		||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 | 
			
		||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 | 
			
		||||
 | 
			
		||||
Name: gtest
 | 
			
		||||
Description: GoogleTest (without main() function)
 | 
			
		||||
 | 
			
		||||
@ -1,5 +1,6 @@
 | 
			
		||||
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 | 
			
		||||
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 | 
			
		||||
prefix=${pcfiledir}/../..
 | 
			
		||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 | 
			
		||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 | 
			
		||||
 | 
			
		||||
Name: gtest_main
 | 
			
		||||
Description: GoogleTest (with main() function)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user