eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Use pcfiledir for prefix in pkgconfig file"

Browse Source 
The change makes implicit assumptions on the layout of the install
tree, which is going to break in many ways.

The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable
to inject the cross-compiled sysroot into `-I` and `-L` paths.
This commit is contained in:
David Seifert 2019-10-05 15:58:45 +02:00
parent 8ae412bd03
commit 71661c223a
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
googlemock/cmake/gmock.pc.in
View File

@ -1,6 +1,5 @@
prefix=${pcfiledir}/../.. libdir=@CMAKE_INSTALL_FULL_LIBDIR@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: gmock Name: gmock
Description: GoogleMock (without main() function) Description: GoogleMock (without main() function)

5
googlemock/cmake/gmock_main.pc.in
View File

@ -1,6 +1,5 @@
prefix=${pcfiledir}/../.. libdir=@CMAKE_INSTALL_FULL_LIBDIR@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: gmock_main Name: gmock_main
Description: GoogleMock (with main() function) Description: GoogleMock (with main() function)

5
googletest/cmake/gtest.pc.in
View File

@ -1,6 +1,5 @@
prefix=${pcfiledir}/../.. libdir=@CMAKE_INSTALL_FULL_LIBDIR@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: gtest Name: gtest
Description: GoogleTest (without main() function) Description: GoogleTest (without main() function)

5
googletest/cmake/gtest_main.pc.in
View File

@ -1,6 +1,5 @@
prefix=${pcfiledir}/../.. libdir=@CMAKE_INSTALL_FULL_LIBDIR@
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: gtest_main Name: gtest_main
Description: GoogleTest (with main() function) Description: GoogleTest (with main() function)