3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 17:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Change location of pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR
This commit is contained in:
Gennadiy Civil 2018-08-15 08:26:25 -07:00 committed by GitHub
commit 997d343dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/CMakeLists.txt
View File

@ -128,13 +128,13 @@ if(INSTALL_GMOCK)
# configure and install pkgconfig files # configure and install pkgconfig files
configure_file( configure_file(
cmake/gmock.pc.in cmake/gmock.pc.in
"${CMAKE_BINARY_DIR}/gmock.pc" "${gmock_BINARY_DIR}/gmock.pc"
@ONLY) @ONLY)
configure_file( configure_file(
cmake/gmock_main.pc.in cmake/gmock_main.pc.in
"${CMAKE_BINARY_DIR}/gmock_main.pc" "${gmock_BINARY_DIR}/gmock_main.pc"
@ONLY) @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") DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif() endif()

6
googletest/CMakeLists.txt
View File

@ -121,13 +121,13 @@ if(INSTALL_GTEST)
# configure and install pkgconfig files # configure and install pkgconfig files
configure_file( configure_file(
cmake/gtest.pc.in cmake/gtest.pc.in
"${CMAKE_BINARY_DIR}/gtest.pc" "${gtest_BINARY_DIR}/gtest.pc"
@ONLY) @ONLY)
configure_file( configure_file(
cmake/gtest_main.pc.in cmake/gtest_main.pc.in
"${CMAKE_BINARY_DIR}/gtest_main.pc" "${gtest_BINARY_DIR}/gtest_main.pc"
@ONLY) @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") DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
endif() endif()