Merge pull request #6701 from sebastic/wmsprovider-qt4_wrap_cpp-depen…

…dencies Add custom target for QT4_WRAP_CPP macro to fix parallel builds.
qgis · Apr 9, 2018 · 410115d · 410115d
2 parents 3c3c00a + aa40425
commit 410115d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -26,6 +26,10 @@ SET (WMS_MOC_HDRS
 
 QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})
 
+ADD_CUSTOM_TARGET(wms_cpp ALL DEPENDS ${WMS_MOC_SRCS})
+
+ADD_DEPENDENCIES(wms_cpp qgis_gui ui)
+
 INCLUDE_DIRECTORIES(
   .
   ../../core
@@ -46,8 +50,6 @@ INCLUDE_DIRECTORIES(SYSTEM
 ADD_LIBRARY(wmsprovider_a STATIC ${WMS_SRCS} ${WMS_MOC_SRCS})
 ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
 
-ADD_DEPENDENCIES(wmsprovider qgis_gui ui)
-
 TARGET_LINK_LIBRARIES(wmsprovider
   qgis_core
   qgis_gui