Ubuntu SDK IDE

Merge lp:~zeller-benjamin/ubuntu-sdk-ide/install_docs into lp:ubuntu-sdk-ide

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

Commit message

Build Qt docs

Description of the change

Build docs

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-24 19:57:43 +0000
3+++ CMakeLists.txt 2015-11-09 16:49:36 +0000
4@@ -145,8 +145,8 @@
5 UPDATE_COMMAND sh -c "exit 0" #nothing to update
6 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"
7 CONFIGURE_COMMAND sh -c "${QT_KIT_SOURCE_DIR}/configure -prefix /usr/ubuntu-sdk-dev `cat ${CMAKE_SOURCE_DIR}/kit_config`"
8- BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS}"
9- INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install"
10+ BUILD_COMMAND sh -c "make ${GENERATED_MAKE_FLAGS} && make docs -j1"
11+ INSTALL_COMMAND sh -c "make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install && make INSTALL_ROOT=${QT_KIT_PREFIX}/qt install_docs"
12 )
13
14

Subscribers

People subscribed via source and target branches