Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixes2 into lp:~bzoltan/ubuntu-sdk-ide/trunk

  1. fixes2
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 62
Proposed branch: lp:~zeller-benjamin/ubuntu-sdk-ide/fixes2
Merge into: lp:~bzoltan/ubuntu-sdk-ide/trunk
Diff against target: 13 lines (+2/-2)
1 file modified
CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/fixes2
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+274852@code.launchpad.net

Commit message

Use correct prefix for devkit Qt

Description of the change

Use correct prefix for devkit Qt

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-10-17 18:46:05 +0000
3+++ CMakeLists.txt 2015-10-19 07:33:14 +0000
4@@ -126,7 +126,7 @@
5 INSTALL_DIR "${QT_KIT_PREFIX}/qt"
6 DOWNLOAD_COMMAND sh -c "exit 0" #already downloaded
7 UPDATE_COMMAND sh -c "exit 0" #nothing to update
8- CONFIGURE_COMMAND sh -c "${QT_SOURCE_DIR}/configure -prefix ${QT_KIT_PREFIX}/qt `cat ${CMAKE_SOURCE_DIR}/qt5config`"
9+ CONFIGURE_COMMAND sh -c "${QT_SOURCE_DIR}/configure -prefix /usr/ubuntu-sdk-dev `cat ${CMAKE_SOURCE_DIR}/qt5config`"
10 BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}"
11- INSTALL_COMMAND sh -c "make install"
12+ INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install"
13 )

Subscribers

People subscribed via source and target branches

to all changes: