Fix single process build

m-kuhn · m-kuhn · commit 8c637821e273 · 2016-07-12T12:43:51.000+02:00
A race condition triggered that sometimes the file
output/python/qgis/__init__.py was not created before a python uic
compiler started and therefore the required module could not be
imported.

This leads to errors like

[ 82%] Generating ui_dialogAbout.py
Traceback (most recent call last):
  File "../../../../../scripts/pyuic-wrapper.py", line 26, in &lt;module&gt;
    import qgis.PyQt.uic.pyuic
ImportError: No module named qgis.PyQt.uic.pyuic
python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/build.make:117:
recipe for target 'python/plugins/GdalTools/tools/ui_dialogAbout.py'
failed
make[2]: *** [python/plugins/GdalTools/tools/ui_dialogAbout.py] Error 1
CMakeFiles/Makefile2:5074: recipe for target
'python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all'
failed
make[1]: ***
[python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all]
Error 2
Makefile:160: recipe for target 'all' failed
make: *** [all] Error 2
diff --git a/python/PyQt/CMakeLists.txt b/python/PyQt/CMakeLists.txt
@@ -21,6 +21,7 @@ SET(PYQT_COMPAT_FILES
 )
 
 ADD_CUSTOM_TARGET(pyqtcompat ALL)
+ADD_DEPENDENCIES(pyqtcompat pyutils)
 
 IF(ENABLE_QT5)
   SET(PYQT_PREFIX PyQt5)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ SET(PYQT_COMPAT_FILES`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`ADD_CUSTOM_TARGET(pyqtcompat ALL)`
	`24`	`+ADD_DEPENDENCIES(pyqtcompat pyutils)`
`24`	`25`
`25`	`26`	`IF(ENABLE_QT5)`
`26`	`27`	`SET(PYQT_PREFIX PyQt5)`