diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-26 14:08:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-26 14:08:11 (GMT) |
| commit | c985c9743340b7f8be19981b241d13b72c1e716d (patch) | |
| tree | 81791c8e88763e4649b966ceb0ea0b4e2a1979cf | |
| parent | 4687de32a485ad682f426bf337cc1eb780a06fbc (diff) | |
| parent | 7ddc2a110c0e52ce6e2e360a69aadf9291edbb11 (diff) | |
| download | CMake-c985c9743340b7f8be19981b241d13b72c1e716d.zip CMake-c985c9743340b7f8be19981b241d13b72c1e716d.tar.gz CMake-c985c9743340b7f8be19981b241d13b72c1e716d.tar.bz2 | |
Merge topic 'googletest_policy_settings'
7ddc2a110c GoogleTest: Ensure policy settings allow use of IN_LIST
Acked-by: Kitware Robot <kwrobot@kitware.com>
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) |