diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-24 12:47:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-24 12:47:27 (GMT) |
| commit | 07253b89190c850ced214b2d9415b6d84e2120c1 (patch) | |
| tree | a03a8d2e2622b71ba8f66d685e17caf790603e81 /Modules | |
| parent | ef6ccfda6038fdf726a337e81fbb378fa02e227f (diff) | |
| parent | a8be8b1b54fe1922a1d1fc0365c3ae5c918b6654 (diff) | |
| download | CMake-07253b89190c850ced214b2d9415b6d84e2120c1.zip CMake-07253b89190c850ced214b2d9415b6d84e2120c1.tar.gz CMake-07253b89190c850ced214b2d9415b6d84e2120c1.tar.bz2 | |
Merge topic 'gnuid-cmp54-fix'
a8be8b1b GNUInstallDirs: Enable CMP0054
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1400
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index 64bd09e..91361d2 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -123,6 +123,9 @@ # allow users who create additional path variables to also compute # absolute paths where necessary, using the same logic. +cmake_policy(PUSH) +cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced + # Convert a cache variable to PATH type macro(_GNUInstallDirs_cache_convert_to_path var description) @@ -371,3 +374,5 @@ foreach(dir ) GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir}) endforeach() + +cmake_policy(POP) |