From: DRC Date: Tue, 12 Feb 2019 19:30:15 +0000 (-0600) Subject: GNUInstallDirs.cmake: Silence CMP0054 warning ... X-Git-Tag: 2.0.2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a8421fb4442dc68f8357dd508d4b8c3c644af61;p=libjpeg-turbo GNUInstallDirs.cmake: Silence CMP0054 warning ... in CMake 3.11 and later --- diff --git a/cmakescripts/GNUInstallDirs.cmake b/cmakescripts/GNUInstallDirs.cmake index ef564bb..7c41196 100644 --- a/cmakescripts/GNUInstallDirs.cmake +++ b/cmakescripts/GNUInstallDirs.cmake @@ -118,7 +118,7 @@ # absolute paths where necessary, using the same logic. #============================================================================= -# Copyright 2016 D. R. Commander +# Copyright 2016, 2019 D. R. Commander # Copyright 2016 Dmitry Marakasov # Copyright 2016 Roger Leigh # Copyright 2015 Alex Turbov @@ -184,7 +184,7 @@ macro(GNUInstallDirs_set_install_dir var docstring) "${docstring} (Default: ${CMAKE_INSTALL_DEFAULT_${var}})" ${_GNUInstallDirs_CMAKE_INSTALL_FORCE_${var}}) - if(NOT "${CMAKE_INSTALL_${var}}" STREQUAL "${CMAKE_INSTALL_DEFAULT_${var}}") + if(NOT CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_DEFAULT_${var}) unset(_GNUInstallDirs_CMAKE_INSTALL_DEFAULT_${var} CACHE) endif()