Skip to content

Commit

Permalink
Merge pull request #3094 from chuckatkins:update-deprecated-cmake-ver…
Browse files Browse the repository at this point in the history
…sion

PiperOrigin-RevId: 349296827
  • Loading branch information
derekmauro committed Dec 28, 2020
2 parents ca4b7c9 + 32f4f52 commit 389cb68
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Note: CMake support is community-based. The maintainers do not use CMake
# internally.

cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 2.8.12)

if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

Expand Down
2 changes: 1 addition & 1 deletion googlemock/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ else()
cmake_policy(SET CMP0048 NEW)
project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

if (COMMAND set_up_hermetic_build)
set_up_hermetic_build()
Expand Down
2 changes: 1 addition & 1 deletion googletest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ else()
cmake_policy(SET CMP0048 NEW)
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
endif()
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 2.8.12)

if (POLICY CMP0063) # Visibility
cmake_policy(SET CMP0063 NEW)
Expand Down
2 changes: 1 addition & 1 deletion googletest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pulled into the main build with `add_subdirectory()`. For example:
New file `CMakeLists.txt.in`:

```cmake
cmake_minimum_required(VERSION 2.8.2)
cmake_minimum_required(VERSION 2.8.12)
project(googletest-download NONE)
Expand Down

0 comments on commit 389cb68

Please sign in to comment.