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

fix install

Browse Source
This commit is contained in:
Zoltán Balogh
2015-08-27 09:50:50 +03:00
parent c9bd3a18ed
commit ec5385a9c1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -48,5 +48,5 @@ ExternalProject_Add(qtcreator_3.5.0
PATCH_COMMAND sh -c "bzr branch lp:~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2 -Ossl.cert_reqs=none && mv sdk-refactor2 ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1/src/plugins/ubuntu && sed -i 's/\\(welcome\\)/\\1 \\\\ \\n ubuntu/g' ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1/src/plugins/plugins.pro"
CONFIGURE_COMMAND sh -c "echo $PWD && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && echo $PWD && ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/qtc -j1 docs deployqt"
INSTALL_COMMAND sh -c "QT_PRIVATE_HEADERS=${CMAKE_BINARY_DIR} && cd ${CMAKE_SOURCE_DIR}/qt/src/qtcreator-3.5.0~rc1 && echo $PWD && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/qtc -j1 docs deployqt"
)

6
debian/rules vendored
View File

@@ -18,3 +18,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_auto_clean:
dh_auto_clean
rm -rf builddir
override_dh_auto_install:
mkdir -p $(CURDIR)/debian/tmp/usr/
cp -a $(CURDIR)/builddir/*/qtc $(CURDIR)/debian/tmp/usr
cd builddir/ubuntu/ && dh_auto_install --destdir=../../debian/tmp/usr