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
cb44c86c
Commit
cb44c86c
authored
Jun 02, 2020
by
Gennadiy Rozental
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2755 from Conan-Kudo:set-version-for-libs
PiperOrigin-RevId: 314427570
parents
26dadc22
94a7cf8c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
CMakeLists.txt
googlemock/CMakeLists.txt
+2
-0
CMakeLists.txt
googletest/CMakeLists.txt
+2
-0
No files found.
googlemock/CMakeLists.txt
View file @
cb44c86c
...
...
@@ -100,8 +100,10 @@ if (MSVC)
else
()
cxx_library
(
gmock
"
${
cxx_strict
}
"
src/gmock-all.cc
)
target_link_libraries
(
gmock PUBLIC gtest
)
set_target_properties
(
gmock PROPERTIES VERSION
${
GOOGLETEST_VERSION
}
)
cxx_library
(
gmock_main
"
${
cxx_strict
}
"
src/gmock_main.cc
)
target_link_libraries
(
gmock_main PUBLIC gmock
)
set_target_properties
(
gmock_main PROPERTIES VERSION
${
GOOGLETEST_VERSION
}
)
endif
()
# If the CMake version supports it, attach header directory information
# to the targets for when we are part of a parent build (ie being pulled
...
...
googletest/CMakeLists.txt
View file @
cb44c86c
...
...
@@ -126,7 +126,9 @@ include_directories(${gtest_build_include_dirs})
# are used for other targets, to ensure that gtest can be compiled by a user
# aggressive about warnings.
cxx_library
(
gtest
"
${
cxx_strict
}
"
src/gtest-all.cc
)
set_target_properties
(
gtest PROPERTIES VERSION
${
GOOGLETEST_VERSION
}
)
cxx_library
(
gtest_main
"
${
cxx_strict
}
"
src/gtest_main.cc
)
set_target_properties
(
gtest_main PROPERTIES VERSION
${
GOOGLETEST_VERSION
}
)
# If the CMake version supports it, attach header directory information
# to the targets for when we are part of a parent build (ie being pulled
# in via add_subdirectory() rather than being a standalone build).
...
...
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