Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
997d343d
Unverified
Commit
997d343d
authored
Aug 15, 2018
by
Gennadiy Civil
Committed by
GitHub
Aug 15, 2018
Browse files
Options
Browse Files
Download
Plain Diff
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
parents
587ceaea
02671abb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CMakeLists.txt
googlemock/CMakeLists.txt
+3
-3
CMakeLists.txt
googletest/CMakeLists.txt
+3
-3
No files found.
googlemock/CMakeLists.txt
View file @
997d343d
...
...
@@ -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
()
...
...
googletest/CMakeLists.txt
View file @
997d343d
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment