Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 456990 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +9 lines)
Line  Link Here
0
-- docs/CMakeLists.txt
0
++ docs/CMakeLists.txt
Lines 11-17 Link Here
11
CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY)
11
CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY)
12
12
13
# now build documentation
13
# now build documentation
14
ADD_CUSTOM_TARGET(doc
14
ADD_CUSTOM_TARGET(doc ALL
15
  COMMAND "${DOXYGEN_EXECUTABLE}"
15
  COMMAND "${DOXYGEN_EXECUTABLE}"
16
  DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in
16
  DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in
17
  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
17
  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
Lines 19-23 Link Here
19
)
19
)
20
20
21
# install documentation  
21
# install documentation  
22
FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*")
22
INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})
23
INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR})
24
-- CMakeLists.txt
23
++ CMakeLists.txt
Lines 30-36 Link Here
30
30
31
# options controlling the build process
31
# options controlling the build process
32
OPTION(BUILD_STATIC "Build static library" OFF)
32
OPTION(BUILD_STATIC "Build static library" OFF)
33
OPTION(BUILD_TESTS "Build test programs" ON)
33
OPTION(BUILD_TESTS "Build test programs" OFF)
34
OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
34
OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
35
OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF)
35
OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF)
36
OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF)
36
OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF)
Lines 74-83 Link Here
74
 
74
 
75
# define destination dirs (relative to prefix)
75
# define destination dirs (relative to prefix)
76
SET(BINDIR bin)
76
SET(BINDIR bin)
77
SET(LIBDIR lib${LIB_SUFFIX})
77
# SET(LIBDIR lib${LIB_SUFFIX})
78
SET(INCLUDEDIR include)
78
SET(INCLUDEDIR include)
79
SET(DATADIR share/lensfun)
79
SET(DATADIR share/lensfun)
80
SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
80
# SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
81
81
82
IF(WIN32)
82
IF(WIN32)
83
  # install into place in build-dir  
83
  # install into place in build-dir  
Lines 125-136 Link Here
125
ENDIF()
125
ENDIF()
126
126
127
# install include files
127
# install include files
128
INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun)
128
INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR})
129
IF(NOT HAVE_REGEX_H)
129
IF(NOT HAVE_REGEX_H)
130
  INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
130
  INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
131
ENDIF()
131
ENDIF()
132
IF(BUILD_AUXFUN)
132
IF(BUILD_AUXFUN)
133
  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun)
133
  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR})
134
ENDIF()
134
ENDIF()
135
135
136
# install db files
136
# install db files

Return to bug 456990