diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-06-13 17:15:59 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-06-13 17:15:59 (GMT) |
| commit | 26afdba792e52cac00ce11644c3c0b1789c40bf7 (patch) | |
| tree | 9b99024b149bf5b13092baa158ea5cacf8cc5b28 | |
| parent | af4c2cb098a35f4898c5089335c10ba4bd5a4fce (diff) | |
| parent | e580d99193e30a00a52e5075fce97ab0cd286ac3 (diff) | |
| download | googletest-26afdba792e52cac00ce11644c3c0b1789c40bf7.zip googletest-26afdba792e52cac00ce11644c3c0b1789c40bf7.tar.gz googletest-26afdba792e52cac00ce11644c3c0b1789c40bf7.tar.bz2 | |
Merge pull request #2283 from xammy:cmake-cmp0054
PiperOrigin-RevId: 253052041
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 04def60..2f70f0b 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -12,6 +12,10 @@ # Test and Google Mock's option() definitions, and thus must be # called *after* the options have been defined. +if (POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif (POLICY CMP0054) + # Tweaks CMake's default compiler/linker settings to suit Google Test's needs. # # This must be a macro(), as inside a function string() can only |