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

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
997d343d · Gennadiy Civil · GitHub · 587ceaea · 02671abb · 997d343d
Unverified Commit 997d343d authored Aug 15, 2018 by Gennadiy Civil Committed by GitHub Aug 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

googlemock/CMakeLists.txt googlemock/CMakeLists.txt +3 -3

googletest/CMakeLists.txt googletest/CMakeLists.txt +3 -3

No files found.
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -128,13 +128,13 @@ if(INSTALL_GMOCK)
  # 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()

--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -121,13 +121,13 @@ if(INSTALL_GTEST)
  # 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()