diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-25 14:42:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-07-25 14:42:14 (GMT) |
| commit | 8442d9fc3fe71c12dd613ba585b196da93d6d9f1 (patch) | |
| tree | 1c6f777822773a5b03cf4a989c150d03bc0ec534 | |
| parent | 504129889335fc7680a7894bc85eaf60bffc880c (diff) | |
| parent | 7ddc2a110c0e52ce6e2e360a69aadf9291edbb11 (diff) | |
| download | CMake-8442d9fc3fe71c12dd613ba585b196da93d6d9f1.zip CMake-8442d9fc3fe71c12dd613ba585b196da93d6d9f1.tar.gz CMake-8442d9fc3fe71c12dd613ba585b196da93d6d9f1.tar.bz2 | |
Merge branch 'googletest_policy_settings' into release-3.12
Merge-request: !2237
| -rw-r--r-- | Modules/GoogleTest.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index bfb83e1..2c9ee11 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -238,6 +238,10 @@ same as the Google Test name (i.e. ``suite.testcase``); see also #]=======================================================================] +# Save project's policies +cmake_policy(PUSH) +cmake_policy(SET CMP0057 NEW) # if IN_LIST + #------------------------------------------------------------------------------ function(gtest_add_tests) @@ -454,3 +458,6 @@ endfunction() set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/GoogleTestAddTests.cmake ) + +# Restore project's policies +cmake_policy(POP) |