From 5fbac5da5ba6b6e095a63ed8fb204551e7ce84b1 Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Wed, 9 Mar 2016 23:32:35 +0100 Subject: [PATCH] cmake: fix library namaes for Qt5 version of QtSingleApplication At least on Gentoo they start with 'Qt5', not 'Qt' --- cmake/Modules/FindQtSingleApplication.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake index f00e6ef55..4229e98b4 100644 --- a/cmake/Modules/FindQtSingleApplication.cmake +++ b/cmake/Modules/FindQtSingleApplication.cmake @@ -13,6 +13,7 @@ SET(QTSINGLEAPPLICATION_FOUND FALSE) IF(QT4_FOUND) + message(STATUS "Looking for Qt4 single application library") FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication # standard locations /usr/include @@ -23,12 +24,14 @@ IF(QT4_FOUND) ${FRAMEWORK_INCLUDE_DIR}/QtSolutions ) - SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) + SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} + QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY NAMES ${QTSINGLEAPPLICATION_NAMES} PATHS ${QT_LIBRARY_DIR} ) ELSEIF(Qt5Widgets_FOUND) + message(STATUS "Looking for Qt5 single application library") FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR}) FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions) @@ -37,7 +40,9 @@ ELSEIF(Qt5Widgets_FOUND) ENDIF() ENDFOREACH() - SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) + SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} + Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6 + QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION) GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)