Skip to content

Commit fd7c3a2

Browse files
committed
Fix output/python/qgis dir for Win32 builds that add dir/CMAKE_CFG_INTDIR
1 parent d6e832d commit fd7c3a2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

python/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ IF (WITH_INTERNAL_SPATIALITE)
1515
ENDIF (WITH_INTERNAL_SPATIALITE)
1616

1717
SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
18+
FILE (MAKE_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
1819
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
1920
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
2021

@@ -153,6 +154,7 @@ SET(PY_FILES
153154
FILE(GLOB UI_FILES *.ui)
154155
PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) # returns absolute paths
155156
ADD_CUSTOM_TARGET(pyutils ALL DEPENDS ${PYUI_FILES})
157+
INSTALL(FILES ${PY_FILES} ${PYUI_FILES} DESTINATION "${QGIS_PYTHON_DIR}")
156158

157159
# stage to output to make available when QGIS is run from build directory
158160
FOREACH(pyfile ${PY_FILES} ${PYUI_FILES})
@@ -164,8 +166,6 @@ FOREACH(pyfile ${PY_FILES} ${PYUI_FILES})
164166
)
165167
ENDFOREACH(pyfile)
166168

167-
INSTALL(FILES ${PY_FILES} ${PYUI_FILES} DESTINATION "${QGIS_PYTHON_DIR}")
168-
169169
ADD_SUBDIRECTORY(console_help)
170170

171171
# Byte-compile staged PyQGIS utilities

0 commit comments

Comments
 (0)