[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - doc/CMakeLists.txt

Bernhard Sessler bernhard.sessler at corscience.de
Sat Jan 11 08:14:37 PST 2014


 doc/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c51632874022063b5fdf1cd7557dc4bf2b7f727d
Author: Bernhard Sessler <bernhard.sessler at corscience.de>
Date:   Wed Jan 8 15:42:07 2014 +0100

    doc: Fix installation path for API documentation
    
    The documentation is now installed to
    <prefix>/share/cppunit-<version>/doc when CPPUNIT_INSTALL_APIDOC
    is ON.
    
    Change-Id: If6d07763d0e2aedf67c2792a15757f8f59761ffa
    Signed-off-by: Bernhard Sessler <bernhard.sessler at corscience.de>
    Reviewed-on: https://gerrit.libreoffice.org/7313
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 08864b8..bb73a31 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -36,5 +36,6 @@ add_custom_target(apidoc ${_cppunit_apidoc_all}
     COMMENT             "Generating HTML documentation")
 
 if(CPPUNIT_INSTALL_APIDOC)
-    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cppunit DESTINATION share/doc)
+    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cppunit/
+        DESTINATION share/${CPPUNIT_VERSION}/doc COMPONENT doc)
 endif()


More information about the Libreoffice-commits mailing list