Qt5: fix plugin installation
This commit is contained in:
parent
809f390e2f
commit
c4458b16b2
3 changed files with 10 additions and 1 deletions
|
@ -201,10 +201,13 @@ if(Qt5Widgets_FOUND)
|
||||||
list(APPEND COCKATRICE_LIBS LinguistTools)
|
list(APPEND COCKATRICE_LIBS LinguistTools)
|
||||||
endif()
|
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
|
# Note: header files are MOC-ed automatically by cmake
|
||||||
QT5_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
|
QT5_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS})
|
||||||
QT5_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
|
QT5_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
|
||||||
|
|
||||||
|
# guess plugins directory
|
||||||
|
set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Declare path variables
|
# Declare path variables
|
||||||
|
|
|
@ -63,6 +63,9 @@ if(Qt5Widgets_FOUND)
|
||||||
include_directories(${Qt5Svg_INCLUDE_DIRS})
|
include_directories(${Qt5Svg_INCLUDE_DIRS})
|
||||||
list(APPEND ORACLE_LIBS Svg)
|
list(APPEND ORACLE_LIBS Svg)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# guess plugins directory
|
||||||
|
set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(../cockatrice/src)
|
INCLUDE_DIRECTORIES(../cockatrice/src)
|
||||||
|
|
|
@ -51,6 +51,9 @@ if(Qt5Widgets_FOUND)
|
||||||
include_directories(${Qt5Sql_INCLUDE_DIRS})
|
include_directories(${Qt5Sql_INCLUDE_DIRS})
|
||||||
list(APPEND SERVATRICE_LIBS Sql)
|
list(APPEND SERVATRICE_LIBS Sql)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# guess plugins directory
|
||||||
|
set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
SET(QT_DONT_USE_QTGUI TRUE)
|
SET(QT_DONT_USE_QTGUI TRUE)
|
||||||
|
|
Loading…
Reference in a new issue