diff options
| author | Harald Fernengel <harry@kdevelop.org> | 2015-12-17 16:30:57 +0100 |
|---|---|---|
| committer | Kevin Funk <kfunk@kde.org> | 2015-12-28 22:37:22 +0000 |
| commit | 959f09bbc5757bc42db603b2c085ad46fc12af96 (patch) | |
| tree | a35ad267118604c6bf341a90bad90b79db22bcf2 /mkspecs/features/data | |
| parent | b1c156d692b21a04e31d5658ee6a73867e86e48f (diff) | |
| download | qtbase-959f09bbc5757bc42db603b2c085ad46fc12af96.tar.gz | |
Remove CMake warning
CMP0054 changes CMake behavior wrt. interpreting quoted arguments in
if() statements. This change ensures that CMP0054 dev warnings are
never emitted no matter how polluted the environment, e.g. even
if the variable ${5.5.1} is defined and no matter whether CMP0054
is set to OLD, NEW or undefined.
Change-Id: Iee008497b333e2db23fb1adbf8b02252314ffa8a
Reviewed-by: Kevin Funk <kfunk@kde.org>
Reviewed-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'mkspecs/features/data')
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in index e804754912..7c42430e97 100644 --- a/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in +++ b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in @@ -1,11 +1,11 @@ set(PACKAGE_VERSION $$CMAKE_PACKAGE_VERSION) -if(\"\${PACKAGE_VERSION}\" VERSION_LESS \"\${PACKAGE_FIND_VERSION}\") +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(\"\${PACKAGE_FIND_VERSION}\" STREQUAL \"\${PACKAGE_VERSION}\") + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE) endif() endif() |