Attachment #219723 for bug #206934

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

Lines 3-8 Link Here

(-)digikam-1.1.0-orig-rbr/CMakeLists.txt (-36 / +9 lines)
3	OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)	3	OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
4	OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)	4	OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
5		5
		6	ENABLE_LANGUAGE(Fortran)
		7
6	# ==================================================================================================	8	# ==================================================================================================
7	# Information to update before to release this package.	9	# Information to update before to release this package.
8		10
Lines 127-132 Link Here
127	# This function call the script cmake/modules/FindPGF.cmake	129	# This function call the script cmake/modules/FindPGF.cmake
128	FIND_PACKAGE(PGF)	130	FIND_PACKAGE(PGF)
129		131
		132	# Included to unbundle lapack that is in portage tree.
		133	FIND_PACKAGE(LAPACK)
		134
130	FIND_PACKAGE(Jasper)	135	FIND_PACKAGE(Jasper)
131	FIND_PACKAGE(Kdcraw)	136	FIND_PACKAGE(Kdcraw)
132	FIND_PACKAGE(Kexiv2)	137	FIND_PACKAGE(Kexiv2)
Lines 311-323 Link Here
311	MESSAGE(STATUS "")	316	MESSAGE(STATUS "")
312	ENDIF(DOXYGEN_FOUND)	317	ENDIF(DOXYGEN_FOUND)
313		318
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)	319	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 AND LAPACK_FOUND)
315	MESSAGE(STATUS " digiKam will be compiled................. YES")	320	MESSAGE(STATUS " digiKam will be compiled................. YES")
316	SET(DIGIKAM_CAN_BE_COMPILED true)	321	SET(DIGIKAM_CAN_BE_COMPILED true)
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)	322	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 AND LAPACK_FOUND)
318	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")	323	MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO (Look README file for more details about dependencies)")
319	SET(DIGIKAM_CAN_BE_COMPILED false)	324	SET(DIGIKAM_CAN_BE_COMPILED false)
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)	325	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 AND LAPACK_FOUND)
321		326
322	MESSAGE(STATUS "----------------------------------------------------------------------------------")	327	MESSAGE(STATUS "----------------------------------------------------------------------------------")
323	MESSAGE(STATUS "")	328	MESSAGE(STATUS "")
Lines 478-516 Link Here
478	${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp	483	${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
479	)	484	)
480		485
481	SET(libclapack_SRCS	486	INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS})
482	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
483	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
484	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
485	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c
486	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c
487	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c
488	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c
489	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c
490	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c
491	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c
492	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c
493	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c
494	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c
495	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c
496	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c
497	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c
498	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c
499	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c
500	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c
501	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c
502	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c
503	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c
504	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c
505	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c
506	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c
507	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c
508	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c
509	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c
510	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c
511	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
512	${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
513	)
514		487
515	SET(libdimgfilters_SRCS	488	SET(libdimgfilters_SRCS
516	${libclapack_SRCS}	489	${libclapack_SRCS}




                     ${PNG_PNG_INCLUDE_DIR}
                     ${TIFF_INCLUDE_DIR}
		     ${PGF_INCLUDE_DIRS}
		     ${LAPACK_INCLUDE_DIRS}
                   )



		      ${PGF_LIBRARIES}
                      ${LCMS_LIBRARIES}
                      ${JASPER_LIBRARIES}
		      ${LAPACK_LIBRARIES}

                      # Require by CImg library which use pthread internally.
                      ${CMAKE_THREAD_LIBS_INIT}

                      ${QT_QTGUI_LIBRARY}
                      ${QT_QTSQL_LIBRARY}
		      ${PGF_LIBRARIES}
		      ${LAPACK_LIBRARIES}
                     )

SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )




                     imageproperties
                     dialogs
                     3rdparty/cimg
                     3rdparty/clapack
                     ${JPEG_INCLUDE_DIR}
                     ${TIFF_INCLUDE_DIR}
                     ${PNG_INCLUDE_DIR}
		     ${PGF_INCLUDE_DIRS}
                     ${JASPER_INCLUDE_DIR}
		     ${LAPACK_INCLUDE_DIRS}
                   )
ADD_SUBDIRECTORY( curves )
ADD_SUBDIRECTORY( levels )

Return to bug 206934

Lines 74-79 Link Here

(-)digikam-1.1.0-orig-rbr/digikam/CMakeLists.txt (+3 lines)
74	${PNG_PNG_INCLUDE_DIR}	74	${PNG_PNG_INCLUDE_DIR}
75	${TIFF_INCLUDE_DIR}	75	${TIFF_INCLUDE_DIR}
76	${PGF_INCLUDE_DIRS}	76	${PGF_INCLUDE_DIRS}
		77	${LAPACK_INCLUDE_DIRS}
77	)	78	)
78		79
79		80
Lines 150-155 Link Here
150	${PGF_LIBRARIES}	151	${PGF_LIBRARIES}
151	${LCMS_LIBRARIES}	152	${LCMS_LIBRARIES}
152	${JASPER_LIBRARIES}	153	${JASPER_LIBRARIES}
		154	${LAPACK_LIBRARIES}
153		155
154	# Require by CImg library which use pthread internally.	156	# Require by CImg library which use pthread internally.
155	${CMAKE_THREAD_LIBS_INIT}	157	${CMAKE_THREAD_LIBS_INIT}
Lines 206-211 Link Here
206	${QT_QTGUI_LIBRARY}	208	${QT_QTGUI_LIBRARY}
207	${QT_QTSQL_LIBRARY}	209	${QT_QTSQL_LIBRARY}
208	${PGF_LIBRARIES}	210	${PGF_LIBRARIES}
		211	${LAPACK_LIBRARIES}
209	)	212	)
210		213
211	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )	214	SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )

Lines 17-28 Link Here

(-)digikam-1.1.0-orig-rbr/libs/CMakeLists.txt (-1 / +1 lines)
17	imageproperties	17	imageproperties
18	dialogs	18	dialogs
19	3rdparty/cimg	19	3rdparty/cimg
20	3rdparty/clapack
21	${JPEG_INCLUDE_DIR}	20	${JPEG_INCLUDE_DIR}
22	${TIFF_INCLUDE_DIR}	21	${TIFF_INCLUDE_DIR}
23	${PNG_INCLUDE_DIR}	22	${PNG_INCLUDE_DIR}
24	${PGF_INCLUDE_DIRS}	23	${PGF_INCLUDE_DIRS}
25	${JASPER_INCLUDE_DIR}	24	${JASPER_INCLUDE_DIR}
		25	${LAPACK_INCLUDE_DIRS}
26	)	26	)
27	ADD_SUBDIRECTORY( curves )	27	ADD_SUBDIRECTORY( curves )
28	ADD_SUBDIRECTORY( levels )	28	ADD_SUBDIRECTORY( levels )