From c19fa6e19d5fd05f5b6a6c4cf9bb1659d0f41e1f Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Mon, 12 Feb 2018 16:32:15 +0100
Subject: [PATCH] Compatibility of plugins with Qt5
---
plugins/CMakeLists.txt | 4 ++--
plugins/pyqgv/CMakeLists.txt | 16 +++++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index cfbcda4..4626bbd 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -26,6 +26,6 @@ IF(PYTHONQT_FOUND)
CACHE BOOL "Build PyQGV plugin")
ENDIF(PYTHONQT_FOUND)
-IF(BUILD_PY_QGV)
+IF(PYTHONQT_FOUND AND BUILD_PY_QGV)
ADD_SUBDIRECTORY(pyqgv)
-ENDIF(BUILD_PY_QGV)
+ENDIF(PYTHONQT_FOUND AND BUILD_PY_QGV)
diff --git a/plugins/pyqgv/CMakeLists.txt b/plugins/pyqgv/CMakeLists.txt
index 20669fe..0c76cad 100644
--- a/plugins/pyqgv/CMakeLists.txt
+++ b/plugins/pyqgv/CMakeLists.txt
@@ -32,12 +32,18 @@ SET(${PLUGIN_NAME}_FORMS
SET(${PLUGIN_NAME}_RESOURCES
)
-QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS})
-QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
-QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+IF(USE_QT4)
+ QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS})
+ QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
+ QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+ INCLUDE(${QT_USE_FILE})
+ELSE(USE_QT4)
+ QT5_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS})
+ QT5_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
+ QT5_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
+ENDIF(USE_QT4)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_PATH})
-INCLUDE(${QT_USE_FILE})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
ADD_DEFINITIONS(${QT_DEFINITIONS})
ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_NO_DEBUG)
--
GitLab