diff options
author | Gennadiy Civil <misterg@google.com> | 2019-05-29 23:36:07 -0400 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-05-29 23:36:08 -0400 |
commit | 8ffb7e5c88b20a297a2e786c480556467496463b (patch) | |
tree | 8bb03b3e90390d7b6edb7f5ac0a40834476bc037 | |
parent | 899c082633dd13e3d053e2d46895faea12bfe074 (diff) | |
parent | 97d8c47df92b7514dc33d361c21a4d8965f10954 (diff) | |
download | googletest-8ffb7e5c88b20a297a2e786c480556467496463b.tar.gz googletest-8ffb7e5c88b20a297a2e786c480556467496463b.tar.bz2 googletest-8ffb7e5c88b20a297a2e786c480556467496463b.zip |
Merge pull request #2264 from mbrobbel:suppress-cmp0048-warning
PiperOrigin-RevId: 250620088
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | CONTRIBUTING.md | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa9d63ed..3fae2f96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8.8) +if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) +endif (POLICY CMP0048) + project(googletest-distribution) set(GOOGLETEST_VERSION 1.9.0) @@ -16,10 +20,6 @@ else() endif() endif() -if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) -endif (POLICY CMP0048) - enable_testing() include(CMakeDependentOption) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b52f8ee5..c273fdca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,9 @@ instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests. ## Are you a Googler? -If you are a Googler, you can either create an internal change or work on GitHub directly. +If you are a Googler, plese make an attempt to submit an internal change rather +than a GitHub Pull Request. If you are not able to submit an internal change +a PR is acceptable as an alternative. ## Contributing A Patch |