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

wrong library path for libdbusmenu fixed

Browse Source
This commit is contained in:
Zoltán Balogh
2015-08-29 08:34:51 +03:00
parent 041cf287b1
commit 44f5c45685
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -45,8 +45,8 @@ ExternalProject_Add(libdbusmenu-qt
PREFIX "${CMAKE_SOURCE_DIR}/qt"
DOWNLOAD_COMMAND sh -c "bzr branch lp:libdbusmenu-qt dbusmenu-qt -Ossl.cert_reqs=none && mv dbusmenu-qt/* libdbusmenu-qt/"
CONFIGURE_COMMAND sh -c "mkdir -p ${CMAKE_BINARY_DIR}/dbusmenu && cd ${CMAKE_BINARY_DIR}/dbusmenu && cmake -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/qt -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/qt -DUSE_QT5=true -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=lib ${CMAKE_SOURCE_DIR}/qt/src/libdbusmenu-qt/"
BUILD_COMMAND sh -c "cd ${CMAKE_BINARY_DIR}/dbusmenu && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR}/dbusmenu && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt make install"
BUILD_COMMAND sh -c "cd ${CMAKE_BINARY_DIR}/dbusmenu && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make ${GENERATED_MAKE_FLAGS}"
INSTALL_COMMAND sh -c "cd ${CMAKE_BINARY_DIR}/dbusmenu && LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/qt/lib make install"
)
ExternalProject_Add(appmenu-qt5

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
ubuntu-sdk-ide (3.5.0+15.10.20150828-0ubuntu1~0trusty8) trusty; urgency=medium
ubuntu-sdk-ide (3.5.0+15.10.20150828-0ubuntu1~0trusty9) trusty; urgency=medium
* Initial release