diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 15:26:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 15:26:25 (GMT) |
| commit | 997d343dd680e541ef96ce71ee54a91daf2577a0 (patch) | |
| tree | d0c92b4fb2f6d14b59c858574521840dc2b08d41 | |
| parent | 587ceaeaee6c2ccb5e565858d7fe12aaf69795e6 (diff) | |
| parent | 02671abb44c8c34a940d79e777fc7c3b3ebae50e (diff) | |
| download | googletest-997d343dd680e541ef96ce71ee54a91daf2577a0.zip googletest-997d343dd680e541ef96ce71ee54a91daf2577a0.tar.gz googletest-997d343dd680e541ef96ce71ee54a91daf2577a0.tar.bz2 | |
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
| -rw-r--r-- | googlemock/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | googletest/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 6 deletions
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 @@ 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 ba2c2c2..6a917bb 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() |