diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index cfbcda4a2ed6ee11be02be28a434cb1f62a2f414..4626bbd0617d34f3834f6a00b601b70454204924 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 20669fea70c8a1068ff7d4f84379157f2abf58e1..0c76cad74d6c750fec29dafa1fef75928d23accc 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)