Attachment #225793 for bug #311935

View | Details | Raw Unified | Return to bug 311935
Collapse All | Expand All

Lines 34-39 Link Here

(-)digikam-1.2.0-vanilla/CMakeLists.txt (-20 / +50 lines)
34	"${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"	34	"${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
35	)	35	)
36		36
		37	# Path to find FindPGF.cmake script.
		38	SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
		39
		40	# =================================================================================================
		41	# Project options
		42	OPTION(BUILD_DOC "Set ON to install documentation files" OFF)
		43
37	# ==================================================================================================	44	# ==================================================================================================
38	# Debug area codes	45	# Debug area codes
39	# These codes will be set for every project specific path automatically, so	46	# These codes will be set for every project specific path automatically, so
Lines 115-120 Link Here
115	FIND_PACKAGE(JPEG)	122	FIND_PACKAGE(JPEG)
116	FIND_PACKAGE(PNG)	123	FIND_PACKAGE(PNG)
117	FIND_PACKAGE(TIFF)	124	FIND_PACKAGE(TIFF)
		125
		126	# Included to unbundle libpgf that is on portage tree.
		127	# This function call the script cmake/modules/FindPGF.cmake
		128	FIND_PACKAGE(PGF)
		129
118	FIND_PACKAGE(Jasper)	130	FIND_PACKAGE(Jasper)
119	FIND_PACKAGE(Kdcraw)	131	FIND_PACKAGE(Kdcraw)
120	FIND_PACKAGE(Kexiv2)	132	FIND_PACKAGE(Kexiv2)
Lines 210-215 Link Here
210		222
211	PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)	223	PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
212	PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)	224	PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
		225	PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND)
213	PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)	226	PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
214	PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)	227	PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
215	PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)	228	PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)
Lines 311-323 Link Here
311	MESSAGE(STATUS "")	324	MESSAGE(STATUS "")
312	ENDIF(DOXYGEN_FOUND)	325	ENDIF(DOXYGEN_FOUND)
313		326
314	IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)	327	IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
315	MESSAGE(STATUS " digiKam will be compiled................. YES")	328	MESSAGE(STATUS " digiKam will be compiled................. YES")
316	SET(DIGIKAM_CAN_BE_COMPILED true)	329	SET(DIGIKAM_CAN_BE_COMPILED true)
317	ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)	330	ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
318	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")	331	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")
319	SET(DIGIKAM_CAN_BE_COMPILED false)	332	SET(DIGIKAM_CAN_BE_COMPILED false)
320	ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)	333	ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOUND AND KIPI_FOUND)
321		334
322	MESSAGE(STATUS "----------------------------------------------------------------------------------")	335	MESSAGE(STATUS "----------------------------------------------------------------------------------")
323	MESSAGE(STATUS "")	336	MESSAGE(STATUS "")
Lines 952-965 Link Here
952	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp	965	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
953	)	966	)
954		967
955	SET(libpgf_SRCS	968	INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
956	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
957	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
958	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
959	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
960	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
961	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
962	)
963		969
964	SET(libsqlite2_SRCS	970	SET(libsqlite2_SRCS
965	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c	971	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
Lines 1258-1275 Link Here
1258	# ==================================================================================================	1264	# ==================================================================================================
1259	# API documentation generation	1265	# API documentation generation
1260		1266
1261	IF(DOXYGEN_FOUND)
1262		1267
1263	SET(API_DIR ${CMAKE_BINARY_DIR}/api)	1268	# Checks if user ask to build documentation.
1264	SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})	1269	IF(BUILD_DOC)
1265	SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)	1270	IF(DOXYGEN_FOUND)
1266	SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
1267		1271
1268	CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})	1272	MESSAGE(STATUS "")
		1273	MESSAGE(STATUS "Documentation will be installed")
		1274	MESSAGE(STATUS "")
1269		1275
1270	ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}	1276	SET(API_DIR ${CMAKE_BINARY_DIR}/api)
1271	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})	1277	SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
		1278	SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
		1279	SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
		1280
		1281	CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
		1282
		1283	ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
		1284	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
		1285
		1286	ELSE(DOXYGEN_FOUND)
		1287
		1288	MESSAGE(STATUS "")
		1289	MESSAGE(STATUS "Documentation will NOT be installed")
		1290	MESSAGE(STATUS "Doxygen wasn't found on the system")
		1291	MESSAGE(STATUS "")
		1292
		1293	ENDIF(DOXYGEN_FOUND)
		1294
		1295	ELSE(BUILD_DOC)
		1296
		1297	MESSAGE(STATUS "")
		1298	MESSAGE(STATUS "Documentation will NOT be installed")
		1299	MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
		1300	MESSAGE(STATUS "")
		1301
		1302	ENDIF(BUILD_DOC)
1272		1303
1273	ENDIF(DOXYGEN_FOUND)
1274	include(MacroOptionalAddSubdirectory)	1304	include(MacroOptionalAddSubdirectory)
1275	macro_optional_add_subdirectory( po )	1305	macro_optional_add_subdirectory( po )




# - Try to find libpgf
# Once done this will define
#
#  PGF_FOUND - system has libgf
#  PGF_INCLUDE_DIRS - the libpgf include directory
#  PGF_LIBRARIES - Link these to use libpgf

# PKG-CONFIG is required.
INCLUDE(FindPkgConfig REQUIRED)

IF(PKG_CONFIG_FOUND)
	INCLUDE(FindPkgConfig)

	PKG_CHECK_MODULES(PGF libpgf)
ENDIF(PKG_CONFIG_FOUND)




                     ${JPEG_INCLUDE_DIR}
                     ${PNG_PNG_INCLUDE_DIR}
                     ${TIFF_INCLUDE_DIR}
		     ${PGF_INCLUDE_DIRS}
                   )

IF(LENSFUN_LIBRARY)

# Disable Clapack C code warnings.
SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")

# Disable libpgf warnings.
SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")

# Disable liblqr C code warnings.
SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")


                        ${libjpegutils_SRCS}
                        ${libthreadimageio_SRCS}
                        ${libthemeengine_SRCS}
                        ${libpgf_SRCS}
                        ${pgfutils_SRCS}
                        ${libdigikamhelpers_SRCS}


                      ${JPEG_LIBRARIES}
                      ${TIFF_LIBRARIES}
                      ${PNG_LIBRARIES}
		      ${PGF_LIBRARIES}
                      ${LCMS_LIBRARIES}
                      ${JASPER_LIBRARIES}


                             ${libhaar_SRCS}
                             ${libdatabasemodels_SRCS}
                             ${libsqlite2_SRCS}
                             ${libpgf_SRCS}
                             ${pgfutils_SRCS}
   )


                      ${QT_QTCORE_LIBRARY}
                      ${QT_QTGUI_LIBRARY}
                      ${QT_QTSQL_LIBRARY}
		      ${PGF_LIBRARIES}
                     )

SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )

Lines 18-23 Link Here

(-)digikam-1.2.0-vanilla/libs/CMakeLists.txt (+1 lines)
18	${JPEG_INCLUDE_DIR}	18	${JPEG_INCLUDE_DIR}
19	${TIFF_INCLUDE_DIR}	19	${TIFF_INCLUDE_DIR}
20	${PNG_INCLUDE_DIR}	20	${PNG_INCLUDE_DIR}
		21	${PGF_INCLUDE_DIRS}
21	${JASPER_INCLUDE_DIR}	22	${JASPER_INCLUDE_DIR}
22	)	23	)
23	ADD_SUBDIRECTORY( histogram )	24	ADD_SUBDIRECTORY( histogram )

Return to bug 311935

Line 0 Link Here

(-)digikam-1.2.0-vanilla/cmake/modules/FindPGF.cmake (+15 lines)
	1	# - Try to find libpgf
	2	# Once done this will define
	3	#
	4	# PGF_FOUND - system has libgf
	5	# PGF_INCLUDE_DIRS - the libpgf include directory
	6	# PGF_LIBRARIES - Link these to use libpgf
	7
	8	# PKG-CONFIG is required.
	9	INCLUDE(FindPkgConfig REQUIRED)
	10
	11	IF(PKG_CONFIG_FOUND)
	12	INCLUDE(FindPkgConfig)
	13
	14	PKG_CHECK_MODULES(PGF libpgf)
	15	ENDIF(PKG_CONFIG_FOUND)

Lines 89-94 Link Here

(-)digikam-1.2.0-vanilla/digikam/CMakeLists.txt (-5 / +3 lines)
89	${JPEG_INCLUDE_DIR}	89	${JPEG_INCLUDE_DIR}
90	${PNG_PNG_INCLUDE_DIR}	90	${PNG_PNG_INCLUDE_DIR}
91	${TIFF_INCLUDE_DIR}	91	${TIFF_INCLUDE_DIR}
		92	${PGF_INCLUDE_DIRS}
92	)	93	)
93		94
94	IF(LENSFUN_LIBRARY)	95	IF(LENSFUN_LIBRARY)
Lines 100-108 Link Here
100	# Disable Clapack C code warnings.	101	# Disable Clapack C code warnings.
101	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")	102	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
102		103
103	# Disable libpgf warnings.
104	SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
105
106	# Disable liblqr C code warnings.	104	# Disable liblqr C code warnings.
107	SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")	105	SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
108		106
Lines 121-127 Link Here
121	${libjpegutils_SRCS}	119	${libjpegutils_SRCS}
122	${libthreadimageio_SRCS}	120	${libthreadimageio_SRCS}
123	${libthemeengine_SRCS}	121	${libthemeengine_SRCS}
124	${libpgf_SRCS}
125	${pgfutils_SRCS}	122	${pgfutils_SRCS}
126	${libdigikamhelpers_SRCS}	123	${libdigikamhelpers_SRCS}
127		124
Lines 173-178 Link Here
173	${JPEG_LIBRARIES}	170	${JPEG_LIBRARIES}
174	${TIFF_LIBRARIES}	171	${TIFF_LIBRARIES}
175	${PNG_LIBRARIES}	172	${PNG_LIBRARIES}
		173	${PGF_LIBRARIES}
176	${LCMS_LIBRARIES}	174	${LCMS_LIBRARIES}
177	${JASPER_LIBRARIES}	175	${JASPER_LIBRARIES}
178		176
Lines 225-231 Link Here
225	${libhaar_SRCS}	223	${libhaar_SRCS}
226	${libdatabasemodels_SRCS}	224	${libdatabasemodels_SRCS}
227	${libsqlite2_SRCS}	225	${libsqlite2_SRCS}
228	${libpgf_SRCS}
229	${pgfutils_SRCS}	226	${pgfutils_SRCS}
230	)	227	)
231		228
Lines 240-245 Link Here
240	${QT_QTCORE_LIBRARY}	237	${QT_QTCORE_LIBRARY}
241	${QT_QTGUI_LIBRARY}	238	${QT_QTGUI_LIBRARY}
242	${QT_QTSQL_LIBRARY}	239	${QT_QTSQL_LIBRARY}
		240	${PGF_LIBRARIES}
243	)	241	)
244		242
245	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )	243	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )