Merge lp:~desrt/mir/makeinstall-docs into lp:mir/ubuntu

[Allison Karlitskaya]

build: conditionalise "make install" of docs

Only install the docs if BUILD_DOXYGEN is set (which is the same rule
used to build them in the first place).

build: conditionalise "make install" of docs

Only install the docs if BUILD_DOXYGEN is set (which is the same rule
used to build them in the first place).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1187
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~desrt/mir/makeinstall-docs/+merge/220953/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-ci/1664/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1664/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1187
http://jenkins.qa.ubuntu.com/job/mir-ci/1665/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1665/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good

review: Approve

[Alan Griffiths (alan-griffiths)]

OK, but please resubmit targeting lp:/mir/devel

review: Needs Resubmitting

=== modified file 'cmake/Doxygen.cmake'
--- cmake/Doxygen.cmake	2013-10-21 17:41:35 +0000
+++ cmake/Doxygen.cmake	2014-05-26 12:44:46 +0000
@@ -23,5 +23,7 @@
                     COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
                     SOURCES ${PROJECT_BINARY_DIR}/Doxyfile
                     DEPENDS guides)
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+  if (BUILD_DOXYGEN)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+  endif()
 endif()