commit 997d343dd680e541ef96ce71ee54a91daf2577a0
author Gennadiy Civil <gennadiycivil@users.noreply.github.com> Wed Aug 15 08:26:25 2018 -0700
committer GitHub <noreply@github.com> Wed Aug 15 08:26:25 2018 -0700
tree d0c92b4fb2f6d14b59c858574521840dc2b08d41
parent 587ceaeaee6c2ccb5e565858d7fe12aaf69795e6
parent 02671abb44c8c34a940d79e777fc7c3b3ebae50e

Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix

Change location of pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR

googlemock/CMakeLists.txt

diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index bac2e3b..0b1f77a 100644
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -128,13 +128,13 @@
   # configure and install pkgconfig files
   configure_file(
     cmake/gmock.pc.in
-    "${CMAKE_BINARY_DIR}/gmock.pc"
+    "${gmock_BINARY_DIR}/gmock.pc"
     @ONLY)
   configure_file(
     cmake/gmock_main.pc.in
-    "${CMAKE_BINARY_DIR}/gmock_main.pc"
+    "${gmock_BINARY_DIR}/gmock_main.pc"
     @ONLY)
-  install(FILES "${CMAKE_BINARY_DIR}/gmock.pc" "${CMAKE_BINARY_DIR}/gmock_main.pc"
+  install(FILES "${gmock_BINARY_DIR}/gmock.pc" "${gmock_BINARY_DIR}/gmock_main.pc"
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif()
 

googletest/CMakeLists.txt

diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index ba2c2c2..6a917bb 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -121,13 +121,13 @@
   # configure and install pkgconfig files
   configure_file(
     cmake/gtest.pc.in
-    "${CMAKE_BINARY_DIR}/gtest.pc"
+    "${gtest_BINARY_DIR}/gtest.pc"
     @ONLY)
   configure_file(
     cmake/gtest_main.pc.in
-    "${CMAKE_BINARY_DIR}/gtest_main.pc"
+    "${gtest_BINARY_DIR}/gtest_main.pc"
     @ONLY)
-  install(FILES "${CMAKE_BINARY_DIR}/gtest.pc" "${CMAKE_BINARY_DIR}/gtest_main.pc"
+  install(FILES "${gtest_BINARY_DIR}/gtest.pc" "${gtest_BINARY_DIR}/gtest_main.pc"
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif()