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

PKG_CONFIG_PATH seting before building appmenu-qt

Browse Source
This commit is contained in:
Zoltán Balogh
2015-08-29 18:14:48 +03:00
parent 44f5c45685
commit 10920ac4d0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -53,7 +53,7 @@ ExternalProject_Add(appmenu-qt5
DEPENDS libdbusmenu-qt
PREFIX "${CMAKE_SOURCE_DIR}/qt"
DOWNLOAD_COMMAND sh -c "bzr branch lp:appmenu-qt5 appmenu -Ossl.cert_reqs=none && mv appmenu ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/ && sed -i 's/\\(+= gtk2\\)/\\1\\nSUBDIRS += appmenu/g' ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/platformthemes.pro"
CONFIGURE_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/ && ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
CONFIGURE_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/ && PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/dbusmenu/ ${CMAKE_BINARY_DIR}/qt/bin/qmake -r"
BUILD_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/ && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "cd ${CMAKE_SOURCE_DIR}/qt/src/qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platformthemes/ && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make install"
)
@@ -63,6 +63,7 @@ ExternalProject_Add(qtcreator_3.5.0
PREFIX "${CMAKE_SOURCE_DIR}/qt"
DOWNLOAD_COMMAND sh -c "dget https://launchpad.net/ubuntu/+archive/primary/+files/qtcreator_3.5.0~rc1-0ubuntu1.dsc"
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"
SUBDIRS += appmenu
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 && echo $PWD && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make INSTALL_ROOT=${CMAKE_BINARY_DIR}/qtc -j1 docs deployqt"