diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-23 13:03:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-10-23 13:03:10 (GMT) |
| commit | 3d35c3d1a3b289c2d9f54c1859ae865d15a27865 (patch) | |
| tree | 50be2e6702b535300810a3878109be288c7f193c | |
| parent | cd80eb2c50d4fe823d70d86e3fa7eea2cac180bf (diff) | |
| parent | a8be8b1b54fe1922a1d1fc0365c3ae5c918b6654 (diff) | |
| download | CMake-3d35c3d1a3b289c2d9f54c1859ae865d15a27865.zip CMake-3d35c3d1a3b289c2d9f54c1859ae865d15a27865.tar.gz CMake-3d35c3d1a3b289c2d9f54c1859ae865d15a27865.tar.bz2 | |
Merge branch 'gnuid-cmp54-fix' into release-3.10
Merge-request: !1400
| -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) |