Unity Action API

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
Related bugs:	Link a bug report

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

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

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-13:

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2013-12-13:

Yes!

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === modified file 'documentation/qml/CMakeLists.txt'
 --- documentation/qml/CMakeLists.txt	2013-07-11 23:17:56 +0000
 +++ documentation/qml/CMakeLists.txt	2013-12-12 23:34:20 +0000
@@ -1,5 +1,9 @@
  # add a target to generate API documentation with qdoc
--FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
++if(DEFINED ENV{DEB_BUILD_MULTIARCH})
++  set(QDOC_EXECUTABLE "/usr/lib/$ENV{DEB_BUILD_MULTIARCH}/qt5/bin/qdoc")
++else()
++  FIND_PROGRAM(QDOC_EXECUTABLE qdoc)
++endif()
  if(QDOC_EXECUTABLE)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unity-action-qml.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-action-qml.qdocconf @ONLY)
  add_custom_target(qmldoc