Fix output/python/qgis dir for Win32 builds that add dir/CMAKE_CFG_IN…

…TDIR
qgis · Oct 31, 2012 · fd7c3a2 · fd7c3a2
1 parent d6e832d
commit fd7c3a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -15,6 +15,7 @@ IF (WITH_INTERNAL_SPATIALITE)
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
 SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
+FILE (MAKE_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
 SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
 
@@ -153,6 +154,7 @@ SET(PY_FILES
 FILE(GLOB UI_FILES *.ui)
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) # returns absolute paths
 ADD_CUSTOM_TARGET(pyutils ALL DEPENDS ${PYUI_FILES})
+INSTALL(FILES ${PY_FILES} ${PYUI_FILES} DESTINATION "${QGIS_PYTHON_DIR}")
 
 # stage to output to make available when QGIS is run from build directory
 FOREACH(pyfile ${PY_FILES} ${PYUI_FILES})
@@ -164,8 +166,6 @@ FOREACH(pyfile ${PY_FILES} ${PYUI_FILES})
   )
 ENDFOREACH(pyfile)
 
-INSTALL(FILES ${PY_FILES} ${PYUI_FILES} DESTINATION "${QGIS_PYTHON_DIR}")
-
 ADD_SUBDIRECTORY(console_help)
 
 # Byte-compile staged PyQGIS utilities