--- a/cmake/modules/FindQt5.cmake 2016-06-12 13:04:05.000000000 +0200 +++ b/cmake/modules/FindQt5.cmake 2018-04-25 18:04:28.351188748 +0200 @@ -22,8 +22,6 @@ # QT_QTDBUS_LIBRARY The QtDBus library # QT_QTGUI_LIBRARY The QtGui library # QT_QTNETWORK_LIBRARY The QtNetwork library -# QT_QTTEST_LIBRARY The QtTest library -# QT_QTWIDGETS_LIBRARY The QtWidgets library # QT_QTXML_LIBRARY The QtXml library # # also defined, but NOT for general use are @@ -65,23 +63,19 @@ find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) # Copy includes and library names into the same style as pkgconfig used for Qt4 -set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) +set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) -set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) -set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) -set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) +set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}) SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})