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

Install Kit to a dedicated path not to the ../qt/

Browse Source
This commit is contained in:
Zoltán Balogh
2015-10-24 06:35:29 +03:00
parent d73fb87a1d
commit ffb7d002d4
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -140,13 +140,13 @@ ExternalProject_Add(${QT_VERSION}-api
PREFIX "${QT_KIT_PREFIX}"
SOURCE_DIR "${QT_KIT_SOURCE_DIR}"
BINARY_DIR "${QT_KIT_PREFIX}/build"
INSTALL_DIR "${QT_KIT_PREFIX}/qt"
INSTALL_DIR "${QT_KIT_PREFIX}/qt-api"
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
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"
INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt-api install"
)

3
debian/rules vendored
View File

@@ -24,7 +24,8 @@ override_dh_auto_install:
mkdir -p $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
cp -a $(CURDIR)/*/ubuntu-sdk-ide $(CURDIR)/debian/tmp/usr
cp -a $(CURDIR)/*/qt-api-build/qt $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
cp -a $(CURDIR)/*/qt-api $(CURDIR)/debian/tmp/usr/ubuntu-sdk-dev
dh_auto_install --destdir=../../debian/tmp/usr
override_dh_shlibdeps:
dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib
dh_shlibdeps -l/usr/ubuntu-sdk-ide/lib/qtcreator:/usr/ubuntu-sdk-ide/lib:usr/ubuntu-sdk-dev/lib