Merge pull request #2283 from xammy:cmake-cmp0054
PiperOrigin-RevId: 253052041
This commit is contained in:
commit
26afdba792
@ -12,6 +12,10 @@
|
|||||||
# Test and Google Mock's option() definitions, and thus must be
|
# Test and Google Mock's option() definitions, and thus must be
|
||||||
# called *after* the options have been defined.
|
# 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.
|
# 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
|
# This must be a macro(), as inside a function string() can only
|
||||||
|
Loading…
Reference in New Issue
Block a user