From 9de41bc0271b268a91b090d23816664a380ed9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 22 Oct 2018 16:53:07 +0200 Subject: [PATCH] Use qt5 version of system-wide libraries --- CMakeLists.txt | 12 ++++++------ src/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a6921fb0..5c5d02583 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,9 +208,9 @@ endif() option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication library" OFF) if(USE_SYSTEM_QTSINGLEAPPLICATION) message(STATUS "Using system QtSingleApplication library") - find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions) - find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6) - find_library(QTSINGLECOREAPPLICATION_LIBRARIES QtSolutions_SingleCoreApplication-2.6) + find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions) + find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6) + find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6) else(USE_SYSTEM_QTSINGLEAPPLICATION) message(STATUS "Using builtin QtSingleApplication library") add_subdirectory(3rdparty/qtsingleapplication) @@ -222,11 +222,11 @@ endif(USE_SYSTEM_QTSINGLEAPPLICATION) option(USE_SYSTEM_QXT "Use system Qxt library" OFF) if (USE_SYSTEM_QXT) message(STATUS "Using system Qxt library") - find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES QxtCore) - find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES QxtGui) + find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES qt5/QxtCore) + find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES qt5/QxtWidgets) set(QXT_INCLUDE_DIRS ${QXTCORE_INCLUDE_DIRS} ${QXTGUI_INCLUDE_DIRS}) # We only need its header. We don't need to link to QxtCore. - find_library(QXT_LIBRARIES QxtGui) + find_library(QXT_LIBRARIES QxtWidgets-qt5) else (USE_SYSTEM_QXT) message(STATUS "Using builtin Qxt library") add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d98a91827..24f36dfbd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -914,6 +914,7 @@ target_link_libraries(strawberry_lib ${QT_LIBRARIES} ${CHROMAPRINT_LIBRARIES} ${QTSINGLEAPPLICATION_LIBRARIES} + ${QTSINGLECOREAPPLICATION_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${SQLITE_LIBRARIES} ${QOCOA_LIBRARIES}