From c4458b16b2004aa9fbe6c353c58c81134fb4304b Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 25 Jun 2014 15:53:25 +0200 Subject: [PATCH] Qt5: fix plugin installation --- cockatrice/CMakeLists.txt | 5 ++++- oracle/CMakeLists.txt | 3 +++ servatrice/CMakeLists.txt | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 92586891..be347188 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -201,10 +201,13 @@ if(Qt5Widgets_FOUND) list(APPEND COCKATRICE_LIBS LinguistTools) endif() - # Let cmake chew Qt4's translations and resource files + # Let cmake chew Qt5's translations and resource files # Note: header files are MOC-ed automatically by cmake QT5_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS}) QT5_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) + + # guess plugins directory + set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") endif() # Declare path variables diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 99abc4d1..b6db8eb4 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -63,6 +63,9 @@ if(Qt5Widgets_FOUND) include_directories(${Qt5Svg_INCLUDE_DIRS}) list(APPEND ORACLE_LIBS Svg) endif() + + # guess plugins directory + set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") endif() INCLUDE_DIRECTORIES(../cockatrice/src) diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index b1fc00c8..a5743f8e 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -51,6 +51,9 @@ if(Qt5Widgets_FOUND) include_directories(${Qt5Sql_INCLUDE_DIRS}) list(APPEND SERVATRICE_LIBS Sql) endif() + + # guess plugins directory + set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") endif() SET(QT_DONT_USE_QTGUI TRUE)