Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
389cb68b
Commit
389cb68b
authored
Dec 28, 2020
by
Derek Mauro
Browse files
Merge pull request #3094 from chuckatkins:update-deprecated-cmake-version
PiperOrigin-RevId: 349296827
parents
ca4b7c9f
32f4f52d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
CMakeLists.txt
+1
-1
CONTRIBUTING.md
CONTRIBUTING.md
+1
-1
googlemock/CMakeLists.txt
googlemock/CMakeLists.txt
+1
-1
googletest/CMakeLists.txt
googletest/CMakeLists.txt
+1
-1
googletest/README.md
googletest/README.md
+1
-1
No files found.
CMakeLists.txt
View file @
389cb68b
# Note: CMake support is community-based. The maintainers do not use CMake
# Note: CMake support is community-based. The maintainers do not use CMake
# internally.
# internally.
cmake_minimum_required
(
VERSION 2.8.
8
)
cmake_minimum_required
(
VERSION 2.8.
12
)
if
(
POLICY CMP0048
)
if
(
POLICY CMP0048
)
cmake_policy
(
SET CMP0048 NEW
)
cmake_policy
(
SET CMP0048 NEW
)
...
...
CONTRIBUTING.md
View file @
389cb68b
...
@@ -89,7 +89,7 @@ and their own tests from a git checkout, which has further requirements:
...
@@ -89,7 +89,7 @@ and their own tests from a git checkout, which has further requirements:
*
[
Python
](
https://www.python.org/
)
v2.3 or newer (for running some of the
*
[
Python
](
https://www.python.org/
)
v2.3 or newer (for running some of the
tests and re-generating certain source files from templates)
tests and re-generating certain source files from templates)
*
[
CMake
](
https://cmake.org/
)
v2.
6.4
or newer
*
[
CMake
](
https://cmake.org/
)
v2.
8.12
or newer
## Developing Google Test and Google Mock
## Developing Google Test and Google Mock
...
...
googlemock/CMakeLists.txt
View file @
389cb68b
...
@@ -42,7 +42,7 @@ else()
...
@@ -42,7 +42,7 @@ else()
cmake_policy
(
SET CMP0048 NEW
)
cmake_policy
(
SET CMP0048 NEW
)
project
(
gmock VERSION
${
GOOGLETEST_VERSION
}
LANGUAGES CXX C
)
project
(
gmock VERSION
${
GOOGLETEST_VERSION
}
LANGUAGES CXX C
)
endif
()
endif
()
cmake_minimum_required
(
VERSION 2.
6.4
)
cmake_minimum_required
(
VERSION 2.
8.12
)
if
(
COMMAND set_up_hermetic_build
)
if
(
COMMAND set_up_hermetic_build
)
set_up_hermetic_build
()
set_up_hermetic_build
()
...
...
googletest/CMakeLists.txt
View file @
389cb68b
...
@@ -53,7 +53,7 @@ else()
...
@@ -53,7 +53,7 @@ else()
cmake_policy
(
SET CMP0048 NEW
)
cmake_policy
(
SET CMP0048 NEW
)
project
(
gtest VERSION
${
GOOGLETEST_VERSION
}
LANGUAGES CXX C
)
project
(
gtest VERSION
${
GOOGLETEST_VERSION
}
LANGUAGES CXX C
)
endif
()
endif
()
cmake_minimum_required
(
VERSION 2.
6.4
)
cmake_minimum_required
(
VERSION 2.
8.12
)
if
(
POLICY CMP0063
)
# Visibility
if
(
POLICY CMP0063
)
# Visibility
cmake_policy
(
SET CMP0063 NEW
)
cmake_policy
(
SET CMP0063 NEW
)
...
...
googletest/README.md
View file @
389cb68b
...
@@ -93,7 +93,7 @@ pulled into the main build with `add_subdirectory()`. For example:
...
@@ -93,7 +93,7 @@ pulled into the main build with `add_subdirectory()`. For example:
New file
`CMakeLists.txt.in`
:
New file
`CMakeLists.txt.in`
:
```
cmake
```
cmake
cmake_minimum_required
(
VERSION 2.8.2
)
cmake_minimum_required
(
VERSION 2.8.
1
2
)
project
(
googletest-download NONE
)
project
(
googletest-download NONE
)
...
...
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