Merge lp:~xnox/unity-action-api/fix-cross into lp:unity-action-api

Proposed by Dimitri John Ledkov on 2013-12-12
Status: Merged
Approved by: Michał Sawicz on 2013-12-13
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~xnox/unity-action-api/fix-cross
Merge into: lp:unity-action-api
Diff against target: 14 lines (+5/-1)
1 file modified
documentation/qml/CMakeLists.txt (+5/-1)
To merge this branch: bzr merge lp:~xnox/unity-action-api/fix-cross
Reviewer Review Type Date Requested Status
Michał Sawicz 2013-12-12 Approve on 2013-12-13
PS Jenkins bot (community) continuous-integration Approve on 2013-12-13
Review via email: mp+198847@code.launchpad.net

Commit message

Fix cross-compilation, by using correct qdoc at compile time.

Description of the change

Fix cross-compilation, by using correct qdoc at compile time.

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 'documentation/qml/CMakeLists.txt'
2--- documentation/qml/CMakeLists.txt 2013-07-11 23:17:56 +0000
3+++ documentation/qml/CMakeLists.txt 2013-12-12 23:34:20 +0000
4@@ -1,5 +1,9 @@
5 # add a target to generate API documentation with qdoc
6-FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
7+if(DEFINED ENV{DEB_BUILD_MULTIARCH})
8+ set(QDOC_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdoc")
9+else()
10+ FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
11+endif()
12 if(QDOC_EXECUTABLE)
13 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unity-action-qml.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-action-qml.qdocconf @ONLY)
14 add_custom_target(qmldoc

Subscribers

People subscribed via source and target branches