Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/digikam/files: digikam-1.6.0-docs.patch
Date: Thu, 25 Nov 2010 20:30:35
Message-Id: 20101125203029.CE6312003C@flycatcher.gentoo.org
1 dilfridge 10/11/25 20:30:29
2
3 Added: digikam-1.6.0-docs.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.1.9.24/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-gfx/digikam/files/digikam-1.6.0-docs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.6.0-docs.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.6.0-docs.patch?rev=1.1&content-type=text/plain
14
15 Index: digikam-1.6.0-docs.patch
16 ===================================================================
17 diff -ru digikam-1.6.0.orig/CMakeLists.txt digikam-1.6.0/CMakeLists.txt
18 --- digikam-1.6.0.orig/CMakeLists.txt 2010-11-22 18:50:48.000000000 +0100
19 +++ digikam-1.6.0/CMakeLists.txt 2010-11-25 00:16:54.000000000 +0100
20 @@ -1423,7 +1423,14 @@
21 # ==================================================================================================
22 # API documentation generation
23
24 -IF(DOXYGEN_FOUND)
25 +# Checks if user ask to build documentation.
26 +IF(BUILD_DOC)
27 +
28 + IF(DOXYGEN_FOUND)
29 +
30 + MESSAGE(STATUS "")
31 + MESSAGE(STATUS "API documentation will be installed")
32 + MESSAGE(STATUS "")
33
34 SET(API_DIR ${CMAKE_BINARY_DIR}/api)
35 SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
36 @@ -1432,8 +1439,27 @@
37
38 CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
39
40 - ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
41 + ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
42 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
43 -ENDIF(DOXYGEN_FOUND)
44 +
45 + ELSE(DOXYGEN_FOUND)
46 +
47 + MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
48 +
49 + ENDIF(DOXYGEN_FOUND)
50 +
51 +ELSE(BUILD_DOC)
52 +
53 + MESSAGE(STATUS "")
54 + MESSAGE(STATUS "Documentation will NOT be installed")
55 + MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
56 + MESSAGE(STATUS "")
57 +
58 +ENDIF(BUILD_DOC)
59 +
60 +
61 include(MacroOptionalAddSubdirectory)
62 macro_optional_add_subdirectory( po )
63 +
64 +# Build the handbook
65 +add_subdirectory( doc )