Address comments from zbenjamin

This commit is contained in:
Zoltán Balogh
2015-10-21 14:00:18 +03:00
parent 44ecf523dd
commit ac2793a50e
2 changed files with 3 additions and 2 deletions

View File

@@ -122,7 +122,8 @@ ExternalProject_Add(${QT_VERSION}-api
BINARY_DIR "${QT_KIT_PREFIX}/build"
INSTALL_DIR "${QT_KIT_PREFIX}/qt"
DOWNLOAD_COMMAND sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py"
UPDATE_COMMAND sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure"
UPDATE_COMMAND sh -c "exit 0" #nothing to update
PATCH_COMMAND sh -c "cp ${CMAKE_SOURCE_DIR}/desktop_kit_qt.pro ${QT_KIT_SOURCE_DIR}/qt.pro && cp ${CMAKE_SOURCE_DIR}/desktop_kit_configure ${QT_KIT_SOURCE_DIR}/configure"
CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix /usr/ubuntu-sdk-dev `cat ${CMAKE_SOURCE_DIR}/kit_config`"
BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install"