Attachment #218409 for bug #295459

Lines 34-39 SET(DIGIKAM_VERSION_STRING Link Here

(-)a/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 FIND_PACKAGE(LCMS) 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 197-202 MESSAGE(STATUS "") Link Here
197		209
198	PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)	210	PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
199	PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)	211	PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
		212	PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND)
200	PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)	213	PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
201	PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)	214	PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
202	PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)	215	PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)
Lines 298-310 ELSE(DOXYGEN_FOUND) Link Here
298	MESSAGE(STATUS "")	311	MESSAGE(STATUS "")
299	ENDIF(DOXYGEN_FOUND)	312	ENDIF(DOXYGEN_FOUND)
300		313
301	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)	314	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)
302	MESSAGE(STATUS " digiKam will be compiled................. YES")	315	MESSAGE(STATUS " digiKam will be compiled................. YES")
303	SET(DIGIKAM_CAN_BE_COMPILED true)	316	SET(DIGIKAM_CAN_BE_COMPILED true)
304	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)	317	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)
305	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")	318	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")
306	SET(DIGIKAM_CAN_BE_COMPILED false)	319	SET(DIGIKAM_CAN_BE_COMPILED false)
307	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)	320	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)
308		321
309	MESSAGE(STATUS "----------------------------------------------------------------------------------")	322	MESSAGE(STATUS "----------------------------------------------------------------------------------")
310	MESSAGE(STATUS "")	323	MESSAGE(STATUS "")
Lines 889-902 IF(DIGIKAM_CAN_BE_COMPILED) Link Here
889	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp	902	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
890	)	903	)
891		904
892	SET(libpgf_SRCS	905	INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
893	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
894	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
895	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
896	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
897	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
898	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
899	)
900		906
901	SET(libsqlite2_SRCS	907	SET(libsqlite2_SRCS
902	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c	908	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
Lines 1176-1193 ENDIF(DIGIKAM_CAN_BE_COMPILED) Link Here
1176	# ==================================================================================================	1182	# ==================================================================================================
1177	# API documentation generation	1183	# API documentation generation
1178		1184
1179	IF(DOXYGEN_FOUND)
1180		1185
1181	SET(API_DIR ${CMAKE_BINARY_DIR}/api)	1186	# Checks if user ask to build documentation.
1182	SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})	1187	IF(BUILD_DOC)
1183	SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)	1188	IF(DOXYGEN_FOUND)
1184	SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
1185		1189
1186	CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})	1190	MESSAGE(STATUS "")
		1191	MESSAGE(STATUS "Documentation will be installed")
		1192	MESSAGE(STATUS "")
1187		1193
1188	ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}	1194	SET(API_DIR ${CMAKE_BINARY_DIR}/api)
1189	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})	1195	SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
		1196	SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
		1197	SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
		1198
		1199	CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
		1200
		1201	ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
		1202	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
		1203
		1204	ELSE(DOXYGEN_FOUND)
		1205
		1206	MESSAGE(STATUS "")
		1207	MESSAGE(STATUS "Documentation will NOT be installed")
		1208	MESSAGE(STATUS "Doxygen wasn't found on the system")
		1209	MESSAGE(STATUS "")
		1210
		1211	ENDIF(DOXYGEN_FOUND)
		1212
		1213	ELSE(BUILD_DOC)
		1214
		1215	MESSAGE(STATUS "")
		1216	MESSAGE(STATUS "Documentation will NOT be installed")
		1217	MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
		1218	MESSAGE(STATUS "")
		1219
		1220	ENDIF(BUILD_DOC)
1190		1221
1191	ENDIF(DOXYGEN_FOUND)
1192	include(MacroOptionalAddSubdirectory)	1222	include(MacroOptionalAddSubdirectory)
1193	macro_optional_add_subdirectory( po )	1223	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}
                   )



# 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")

SET(digikamcore_LIB_SRCS
                        # basic libs
                        ${libdimg_SRCS}

                        ${libgreycstoration_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 21-26 INCLUDE_DIRECTORIES( dimg Link Here

(-)a/libs/CMakeLists.txt (-1 / +1 lines)
21	${JPEG_INCLUDE_DIR}	21	${JPEG_INCLUDE_DIR}
22	${TIFF_INCLUDE_DIR}	22	${TIFF_INCLUDE_DIR}
23	${PNG_INCLUDE_DIR}	23	${PNG_INCLUDE_DIR}
		24	${PGF_INCLUDE_DIRS}
24	${JASPER_INCLUDE_DIR}	25	${JASPER_INCLUDE_DIR}
25	)	26	)
26	ADD_SUBDIRECTORY( curves )	27	ADD_SUBDIRECTORY( curves )
27	-

Return to bug 295459

Line 0 Link Here

(-)a/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 73-78 INCLUDE_DIRECTORIES( Link Here

(-)a/digikam/CMakeLists.txt (-5 / +3 lines)
73	${JPEG_INCLUDE_DIR}	73	${JPEG_INCLUDE_DIR}
74	${PNG_PNG_INCLUDE_DIR}	74	${PNG_PNG_INCLUDE_DIR}
75	${TIFF_INCLUDE_DIR}	75	${TIFF_INCLUDE_DIR}
		76	${PGF_INCLUDE_DIRS}
76	)	77	)
77		78
78		79
Lines 81-89 INCLUDE_DIRECTORIES( Link Here
81	# Disable Clapack C code warnings.	82	# Disable Clapack C code warnings.
82	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")	83	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
83		84
84	# Disable libpgf warnings.
85	SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
86
87	SET(digikamcore_LIB_SRCS	85	SET(digikamcore_LIB_SRCS
88	# basic libs	86	# basic libs
89	${libdimg_SRCS}	87	${libdimg_SRCS}
Lines 100-106 SET(digikamcore_LIB_SRCS Link Here
100	${libgreycstoration_SRCS}	98	${libgreycstoration_SRCS}
101	${libthreadimageio_SRCS}	99	${libthreadimageio_SRCS}
102	${libthemeengine_SRCS}	100	${libthemeengine_SRCS}
103	${libpgf_SRCS}
104	${pgfutils_SRCS}	101	${pgfutils_SRCS}
105	${libdigikamhelpers_SRCS}	102	${libdigikamhelpers_SRCS}
106		103
Lines 150-155 TARGET_LINK_LIBRARIES(digikamcore Link Here
150	${JPEG_LIBRARIES}	147	${JPEG_LIBRARIES}
151	${TIFF_LIBRARIES}	148	${TIFF_LIBRARIES}
152	${PNG_LIBRARIES}	149	${PNG_LIBRARIES}
		150	${PGF_LIBRARIES}
153	${LCMS_LIBRARIES}	151	${LCMS_LIBRARIES}
154	${JASPER_LIBRARIES}	152	${JASPER_LIBRARIES}
155		153
Lines 193-199 SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS} Link Here
193	${libhaar_SRCS}	191	${libhaar_SRCS}
194	${libdatabasemodels_SRCS}	192	${libdatabasemodels_SRCS}
195	${libsqlite2_SRCS}	193	${libsqlite2_SRCS}
196	${libpgf_SRCS}
197	${pgfutils_SRCS}	194	${pgfutils_SRCS}
198	)	195	)
199		196
Lines 208-213 TARGET_LINK_LIBRARIES(digikamdatabase Link Here
208	${QT_QTCORE_LIBRARY}	205	${QT_QTCORE_LIBRARY}
209	${QT_QTGUI_LIBRARY}	206	${QT_QTGUI_LIBRARY}
210	${QT_QTSQL_LIBRARY}	207	${QT_QTSQL_LIBRARY}
		208	${PGF_LIBRARIES}
211	)	209	)
212		210
213	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )	211	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )