ubports-cn/ubuntu-sdk-ide_orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Zoltán Balogh
2015-10-24 21:57:43 +02:00
parent 604dd62f5a
commit b0426bb8ae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -140,13 +140,13 @@ ExternalProject_Add(${QT_VERSION}-api
PREFIX "${QT_KIT_PREFIX}" PREFIX "${QT_KIT_PREFIX}"
SOURCE_DIR "${QT_KIT_SOURCE_DIR}" SOURCE_DIR "${QT_KIT_SOURCE_DIR}"
BINARY_DIR "${QT_KIT_PREFIX}/build" BINARY_DIR "${QT_KIT_PREFIX}/build"
INSTALL_DIR "${QT_KIT_PREFIX}/qt-api" INSTALL_DIR "${QT_KIT_PREFIX}/qt"
DOWNLOAD_COMMAND sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py" DOWNLOAD_COMMAND sh -c "cd ${QT_KIT_SOURCE_DIR} && ${CMAKE_SOURCE_DIR}/get_qt_sources.py"
UPDATE_COMMAND sh -c "exit 0" #nothing to update 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" 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`" 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}" BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt-api install" INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install"
) )
@@ -158,6 +158,6 @@ ExternalProject_Add(${QT_VERSION}-extras
DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir" DOWNLOAD_COMMAND sh -c "bzr branch lp:ubuntu-sdk-qmake-extras ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras -Ossl.cert_reqs=none --use-existing-dir"
UPDATE_COMMAND sh -c "exit 0" #nothing to update UPDATE_COMMAND sh -c "exit 0" #nothing to update
CONFIGURE_COMMAND sh -c "exit 0" CONFIGURE_COMMAND sh -c "exit 0"
BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt-api/usr/ubuntu-sdk-dev/mkspecs/features" BUILD_COMMAND sh -c "cp ${EXTRAS_PREFIX}/ubuntu-sdk-qmake-extras/*.prf ${QT_KIT_PREFIX}/qt/usr/ubuntu-sdk-dev/mkspecs/features"
INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh" INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR} && ${CMAKE_SOURCE_DIR}/create_sdk.sh"
) )