Attachment #214595 for bug #295459




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

Lines 34-39 Link Here

(-)old/CMakeLists.txt (-11 / +22 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
37	# ==================================================================================================	40	# ==================================================================================================
38	# Debug area codes	41	# Debug area codes
39	# These codes will be set for every project specific path automatically, so	42	# These codes will be set for every project specific path automatically, so
Lines 63-68 Link Here
63	FIND_PACKAGE(JPEG)	66	FIND_PACKAGE(JPEG)
64	FIND_PACKAGE(PNG)	67	FIND_PACKAGE(PNG)
65	FIND_PACKAGE(TIFF)	68	FIND_PACKAGE(TIFF)
		69
		70	# Included to unbundle libpgf that is on portage tree.
		71	# This function call the script cmake/modules/FindPGF.cmake
		72	FIND_PACKAGE(PGF)
		73
66	FIND_PACKAGE(Jasper)	74	FIND_PACKAGE(Jasper)
67	FIND_PACKAGE(Kdcraw)	75	FIND_PACKAGE(Kdcraw)
68	FIND_PACKAGE(Kexiv2)	76	FIND_PACKAGE(Kexiv2)
Lines 181-186 Link Here
181	MESSAGE(STATUS "")	189	MESSAGE(STATUS "")
182	ENDIF(PNG_FOUND)	190	ENDIF(PNG_FOUND)
183		191
		192	IF(PGF_FOUND)
		193	MESSAGE(STATUS " libpgf library found................ YES")
		194	ELSE(PGF_FOUND)
		195	MESSAGE(STATUS " libpgf library found................ NO")
		196	MESSAGE(STATUS "")
		197	MESSAGE(SEND_ERROR " digiKam needs libpgf since it was unbundled. You need to install the development package.")
		198	MESSAGE(STATUS " Libpgf website is at http://www.libpgf.org")
		199	MESSAGE(STATUS "")
		200	ENDIF(PGF_FOUND)
		201
184	IF(JASPER_FOUND)	202	IF(JASPER_FOUND)
185	MESSAGE(STATUS " libjasper library found............. YES")	203	MESSAGE(STATUS " libjasper library found............. YES")
186	ELSE(JASPER_FOUND)	204	ELSE(JASPER_FOUND)
Lines 316-328 Link Here
316	ENDIF(GLIB2_FOUND)	334	ENDIF(GLIB2_FOUND)
317		335
318		336
319	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)	337	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)
320	MESSAGE(STATUS " digiKam will be compiled............ YES")	338	MESSAGE(STATUS " digiKam will be compiled............ YES")
321	SET(DIGIKAM_CAN_BE_COMPILED true)	339	SET(DIGIKAM_CAN_BE_COMPILED true)
322	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)	340	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)
323	MESSAGE(FATAL_ERROR " digiKam will be compiled............ NO (Look README file for more details about dependencies)")	341	MESSAGE(FATAL_ERROR " digiKam will be compiled............ NO (Look README file for more details about dependencies)")
324	SET(DIGIKAM_CAN_BE_COMPILED false)	342	SET(DIGIKAM_CAN_BE_COMPILED false)
325	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)	343	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)
326		344
327	MESSAGE(STATUS "----------------------------------------------------------------------------------")	345	MESSAGE(STATUS "----------------------------------------------------------------------------------")
328	MESSAGE(STATUS "")	346	MESSAGE(STATUS "")
Lines 906-919 Link Here
906	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp	924	${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
907	)	925	)
908		926
909	SET(libpgf_SRCS	927	INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
910	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
911	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
912	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
913	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
914	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
915	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
916	)
917		928
918	SET(libsqlite2_SRCS	929	SET(libsqlite2_SRCS
919	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c	930	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c




                     # specific libs and utilities
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine

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


# Shared libdigikamcore ################################################################

# 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}


    SET_SOURCE_FILES_PROPERTIES(${libsqlite2_SRCS} PROPERTIES COMPILE_FLAGS "-w")
ENDIF(WIN32)

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

SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS}
                             ${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-28 Link Here

(-)old/libs/CMakeLists.txt (+2 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	)
		27
26	ADD_SUBDIRECTORY( curves )	28	ADD_SUBDIRECTORY( curves )
27	ADD_SUBDIRECTORY( levels )	29	ADD_SUBDIRECTORY( levels )
28	ADD_SUBDIRECTORY( histogram )	30	ADD_SUBDIRECTORY( histogram )

Return to bug 295459

Line 0 Link Here

(-)old/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 38-44 Link Here

(-)old/digikam/CMakeLists.txt (-10 / +4 lines)
38	# specific libs and utilities	38	# specific libs and utilities
39	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof	39	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
40	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2	40	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
41	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
42	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack	41	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
43	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg	42	${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
44	${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine	43	${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
Lines 73-79 Link Here
73	${JPEG_INCLUDE_DIR}	72	${JPEG_INCLUDE_DIR}
74	${PNG_PNG_INCLUDE_DIR}	73	${PNG_PNG_INCLUDE_DIR}
75	${TIFF_INCLUDE_DIR}	74	${TIFF_INCLUDE_DIR}
76	)	75	${PGF_INCLUDE_DIRS}
		76	)
77		77
78		78
79	# Shared libdigikamcore ################################################################	79	# Shared libdigikamcore ################################################################
Lines 81-89 Link Here
81	# Disable Clapack C code warnings.	81	# Disable Clapack C code warnings.
82	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")	82	SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
83		83
84	# Disable libpgf warnings.
85	SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
86
87	SET(digikamcore_LIB_SRCS	84	SET(digikamcore_LIB_SRCS
88	# basic libs	85	# basic libs
89	${libdimg_SRCS}	86	${libdimg_SRCS}
Lines 100-106 Link Here
100	${libgreycstoration_SRCS}	97	${libgreycstoration_SRCS}
101	${libthreadimageio_SRCS}	98	${libthreadimageio_SRCS}
102	${libthemeengine_SRCS}	99	${libthemeengine_SRCS}
103	${libpgf_SRCS}
104	${pgfutils_SRCS}	100	${pgfutils_SRCS}
105	${libdigikamhelpers_SRCS}	101	${libdigikamhelpers_SRCS}
106		102
Lines 146-151 Link Here
146	${JPEG_LIBRARIES}	142	${JPEG_LIBRARIES}
147	${TIFF_LIBRARIES}	143	${TIFF_LIBRARIES}
148	${PNG_LIBRARIES}	144	${PNG_LIBRARIES}
		145	${PGF_LIBRARIES}
149	${LCMS_LIBRARIES}	146	${LCMS_LIBRARIES}
150	${JASPER_LIBRARIES}	147	${JASPER_LIBRARIES}
151		148
Lines 182-195 Link Here
182	SET_SOURCE_FILES_PROPERTIES(${libsqlite2_SRCS} PROPERTIES COMPILE_FLAGS "-w")	179	SET_SOURCE_FILES_PROPERTIES(${libsqlite2_SRCS} PROPERTIES COMPILE_FLAGS "-w")
183	ENDIF(WIN32)	180	ENDIF(WIN32)
184		181
185	## Disable libpgf warnings.
186	#SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
187
188	SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS}	182	SET(digikamdatabase_LIB_SRCS ${libdatabase_SRCS}
189	${libhaar_SRCS}	183	${libhaar_SRCS}
190	${libdatabasemodels_SRCS}	184	${libdatabasemodels_SRCS}
191	${libsqlite2_SRCS}	185	${libsqlite2_SRCS}
192	${libpgf_SRCS}
193	${pgfutils_SRCS}	186	${pgfutils_SRCS}
194	)	187	)
195		188
Lines 204-209 Link Here
204	${QT_QTCORE_LIBRARY}	197	${QT_QTCORE_LIBRARY}
205	${QT_QTGUI_LIBRARY}	198	${QT_QTGUI_LIBRARY}
206	${QT_QTSQL_LIBRARY}	199	${QT_QTSQL_LIBRARY}
		200	${PGF_LIBRARIES}
207	)	201	)
208		202
209	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )	203	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )