Merge pull request #2283 from xammy:cmake-cmp0054

PiperOrigin-RevId: 253052041
pull/2286/head
Gennadiy Civil 6 years ago
commit 26afdba792
  1. 4
      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

Loading…
Cancel
Save