Skip to content

Commit 10d1a0e

Browse files
author
jef
committed
fix missing python uis in osm plugin
git-svn-id: http://svn.osgeo.org/qgis/trunk@11384 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7085cf5 commit 10d1a0e

10 files changed

+20
-1053
lines changed

python/plugins/osm/CMakeLists.txt

+20
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,31 @@
33

44
SET (OSM_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/osm)
55

6+
FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)
7+
8+
MACRO(PYQT4_WRAP_UI outfiles)
9+
FOREACH(it ${ARGN})
10+
GET_FILENAME_COMPONENT(out ${it} NAME_WE)
11+
SET(out ${CMAKE_CURRENT_BINARY_DIR}/${out}_ui.py)
12+
ADD_CUSTOM_COMMAND(
13+
COMMAND ${PYUIC4_PROGRAM} ${it} -o ${out}
14+
DEPENDS ${it}
15+
OUTPUT ${out}
16+
)
17+
SET(${outfiles} ${${outfiles}} ${out})
18+
ENDFOREACH(it)
19+
ENDMACRO(PYQT_WRAP_UI)
20+
21+
FILE (GLOB UI_FILES ui_files/*.ui)
22+
PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
23+
24+
ADD_CUSTOM_TARGET(pyuis ALL DEPENDS ${PYUI_FILES})
625

726
FILE (GLOB PYTHON_FILES *.py)
827
FILE (GLOB MAPTOOLS_PYTHON_FILES map_tools/*.py)
928
FILE (GLOB STYLE_FILES styles/*.style)
1029

1130
INSTALL (FILES ${PYTHON_FILES} DESTINATION ${OSM_PLUGIN_DIR})
31+
INSTALL (FILES ${PYUI_FILES} DESTINATION ${OSM_PLUGIN_DIR})
1232
INSTALL (FILES ${MAPTOOLS_PYTHON_FILES} DESTINATION ${OSM_PLUGIN_DIR}/map_tools)
1333
INSTALL (FILES ${STYLE_FILES} DESTINATION ${OSM_PLUGIN_DIR}/styles)

python/plugins/osm/DlgAddRelation_ui.py

-140
This file was deleted.

python/plugins/osm/DlgDownloadOSM_ui.py

-162
This file was deleted.

0 commit comments

Comments
 (0)