From 91d384d9880f48428998854af3f1034592b6b6be Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 23 May 2017 07:16:18 -0700 Subject: [PATCH] Don't use the deprecated CMake variable The *_VERSION_STRING variable has been deprecated in Qt since 5.1.0. Use the non-deprecated variable instead (which is not a string). Qt 5.9.0 has a bug in the deprecated variable. Since it's deprecated, it's probably not going to be fixed until 5.9.1. See https://bugreports.qt.io/browse/QTBUG-60936 Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd0c70e58..414655492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,9 +218,9 @@ set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Svg Q set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test) #disable bluetooth if Qt version is ancient. -if (BTSUPPORT AND "${Qt5Core_VERSION_STRING}" STRLESS "5.4.0") +if (BTSUPPORT AND "${Qt5Core_VERSION}" VERSION_LESS 5.4.0) set(BTSUPPORT OFF) - message(STATUS "Turning off Bluetooth support as Qt version ${Qt5Core_VERSION_STRING} is insufficient for that") + message(STATUS "Turning off Bluetooth support as Qt version ${Qt5Core_VERSION} is insufficient for that") list(REMOVE_ITEM QT_LIBRARIES Qt5::Bluetooth) endif()