aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElias Daler <eliasdaler@yandex.ru>2018-08-13 23:01:00 +0300
committerElias Daler <eliasdaler@yandex.ru>2018-08-13 23:01:09 +0300
commit9ca399ae053d0a2a4d206fffe9ab76f577dbe22e (patch)
tree78786c0026690ca0a18c1c426b8790d68b1fe9eb
parent7800ba3eeade13ae7afb5877d7d59202a4d0ed5e (diff)
downloadgoogletest-9ca399ae053d0a2a4d206fffe9ab76f577dbe22e.tar.gz
googletest-9ca399ae053d0a2a4d206fffe9ab76f577dbe22e.tar.bz2
googletest-9ca399ae053d0a2a4d206fffe9ab76f577dbe22e.zip
Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717)
-rw-r--r--googlemock/CMakeLists.txt6
-rw-r--r--googletest/CMakeLists.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index bac2e3bf..0b1f77ae 100644
--- 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()
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index ba2c2c2c..6a917bb4 100644
--- 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()