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.7.0-docs.patch digikam-1.5.0-unbundle.patch digikam-1.4.0-docs.patch
Date: Tue, 28 Dec 2010 17:08:09
Message-Id: 20101228170756.B408F20047@flycatcher.gentoo.org
1 dilfridge 10/12/28 17:07:56
2
3 Added: digikam-1.7.0-docs.patch
4 Removed: digikam-1.5.0-unbundle.patch
5 digikam-1.4.0-docs.patch
6 Log:
7 Version bump; remove old
8
9 (Portage version: 2.1.9.26/cvs/Linux i686)
10
11 Revision Changes Path
12 1.1 media-gfx/digikam/files/digikam-1.7.0-docs.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.7.0-docs.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-1.7.0-docs.patch?rev=1.1&content-type=text/plain
16
17 Index: digikam-1.7.0-docs.patch
18 ===================================================================
19 diff -ruN digikam-1.7.0.orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt
20 --- digikam-1.7.0.orig/CMakeLists.txt 2010-12-19 11:31:26.000000000 +0100
21 +++ digikam-1.7.0/CMakeLists.txt 2010-12-26 18:57:13.000000000 +0100
22 @@ -1423,8 +1423,15 @@
23 # ==================================================================================================
24 # API documentation generation
25
26 +# Checks if user ask to build documentation.
27 +IF(BUILD_DOC)
28 +
29 IF(DOXYGEN_FOUND)
30
31 + MESSAGE(STATUS "")
32 + MESSAGE(STATUS "API documentation will be installed")
33 + MESSAGE(STATUS "")
34 +
35 SET(API_DIR ${CMAKE_BINARY_DIR}/api)
36 SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
37 SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
38 @@ -1432,9 +1439,28 @@
39
40 CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
41
42 - ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
43 + ADD_CUSTOM_TARGET(doc ALL ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
44 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
45 +
46 +ELSE(DOXYGEN_FOUND)
47 +
48 + MESSAGE(FATAL_ERROR "API documentation requested but doxygen not found")
49 +
50 ENDIF(DOXYGEN_FOUND)
51 +
52 +ELSE(BUILD_DOC)
53 +
54 + MESSAGE(STATUS "")
55 + MESSAGE(STATUS "Documentation will NOT be installed")
56 + MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
57 + MESSAGE(STATUS "")
58 +
59 +ENDIF(BUILD_DOC)
60 +
61 find_package(Msgfmt REQUIRED)
62 find_package(Gettext REQUIRED)
63 add_subdirectory( po )
64 +
65 +# Build the handbook
66 +add_subdirectory( doc )
67 +