Skip to content
Permalink
Browse files

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

…TDIR
  • Loading branch information
dakcarto committed Oct 31, 2012
1 parent d6e832d commit fd7c3a24bd7d9cc15d891164a5cd2702f053666a
Showing with 2 additions and 2 deletions.
  1. +2 −2 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

0 comments on commit fd7c3a2

Please sign in to comment.
You can’t perform that action at this time.