diff options
Diffstat (limited to 'src/libs')
27 files changed, 435 insertions, 9 deletions
diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt new file mode 100644 index 00000000..853e333e --- /dev/null +++ b/src/libs/CMakeLists.txt @@ -0,0 +1,19 @@ +##### subfolders + +add_subdirectory( sqlite2 ) +tde_conditional_add_subdirectory( WITH_LOCAL_SQLITE3 sqlite3 ) +add_subdirectory( lprof ) +add_subdirectory( histogram ) +add_subdirectory( levels ) +add_subdirectory( curves ) +add_subdirectory( whitebalance ) +add_subdirectory( dmetadata ) +add_subdirectory( dimg ) +add_subdirectory( threadimageio ) +add_subdirectory( themeengine ) +add_subdirectory( widgets ) +add_subdirectory( greycstoration ) +add_subdirectory( thumbbar ) +add_subdirectory( jpegutils ) +add_subdirectory( imageproperties ) +add_subdirectory( dialogs ) diff --git a/src/libs/curves/CMakeLists.txt b/src/libs/curves/CMakeLists.txt new file mode 100644 index 00000000..843f65a7 --- /dev/null +++ b/src/libs/curves/CMakeLists.txt @@ -0,0 +1,14 @@ +##### curves library (static) + +tde_add_library( curves STATIC_PIC + SOURCES imagecurves.cpp + LINK histogram-static tdecore-shared +) + + +##### other files + +install( + FILES imagecurves.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/dialogs/CMakeLists.txt b/src/libs/dialogs/CMakeLists.txt new file mode 100644 index 00000000..6d80a8a8 --- /dev/null +++ b/src/libs/dialogs/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/dimg/filters + ${CMAKE_SOURCE_DIR}/src/libs/thumbbar + ${CMAKE_SOURCE_DIR}/src/libs/widgets/common + ${CMAKE_SOURCE_DIR}/src/libs/widgets/metadata + ${CMAKE_SOURCE_DIR}/src/libs/widgets/iccprofiles + ${CMAKE_SOURCE_DIR}/src/libs/widgets/imageplugins + ${CMAKE_SOURCE_DIR}/src/utilities/imageeditor/canvas +) + + +##### dialog library (static) + +tde_add_library( dialog STATIC_PIC AUTOMOC + SOURCES + deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp iccprofileinfodlg.cpp + deletedialog.cpp dprogressdlg.cpp + LINK + tdecore-shared +) + +##### dialogshowfoto library (static) + +tde_add_library( dialogshowfoto STATIC_PIC AUTOMOC + SOURCES iccprofileinfodlg.cpp imagedialog.cpp rawcameradlg.cpp + LINK tdecore-shared +) + + +##### other files + +install( + FILES iccprofileinfodlg.h dprogressdlg.h imagedialog.h rawcameradlg.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/dimg/CMakeLists.txt b/src/libs/dimg/CMakeLists.txt new file mode 100644 index 00000000..5cfb59bb --- /dev/null +++ b/src/libs/dimg/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/filters + ${CMAKE_CURRENT_SOURCE_DIR}/loaders +) + + +##### subfolders + +add_subdirectory( loaders ) +add_subdirectory( filters ) + + +##### dimg library (static) + +tde_add_library( dimg STATIC_PIC + SOURCES dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp + LINK + histogram-static levels-static curves-static whitebalance-static + dimgloaders-static dimgfilters-static dmetadata-static + tdecore-shared ${KDCRAW_LIBRARIES} ${LCMS_LIBRARIES} +) + + +##### other files + +install( + FILES dimg.h dcolor.h dcolorpixelaccess.h dcolorcomposer.h dcolorblend.h ddebug.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/dimg/filters/CMakeLists.txt b/src/libs/dimg/filters/CMakeLists.txt new file mode 100644 index 00000000..5e0646f9 --- /dev/null +++ b/src/libs/dimg/filters/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories( + ${CMAKE_SOURCE_DIR}/src/libs/levels +) + + +##### dimgfilters library (static) + +tde_add_library( dimgfilters STATIC_PIC + SOURCES + bcgmodifier.cpp hslmodifier.cpp icctransform.cpp dimgimagefilters.cpp dimgthreadedfilter.cpp + dimggaussianblur.cpp dimgsharpen.cpp colormodifier.cpp + LINK + dimg-static histogram-static tdecore-shared +) + + +##### other files + +install( + FILES + bcgmodifier.h hslmodifier.h dimgthreadedfilter.h dimgimagefilters.h + icctransform.h colormodifier.h dimgsharpen.h dimggaussianblur.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/dimg/loaders/CMakeLists.txt b/src/libs/dimg/loaders/CMakeLists.txt new file mode 100644 index 00000000..e880e579 --- /dev/null +++ b/src/libs/dimg/loaders/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/curves + ${CMAKE_SOURCE_DIR}/src/libs/dimg/filters + ${CMAKE_SOURCE_DIR}/src/libs/levels + ${CMAKE_SOURCE_DIR}/src/libs/whitebalance +) + + +##### dimgloaders library (static) + +tde_add_library( dimgloaders STATIC_PIC AUTOMOC + SOURCES + dimgloader.cpp pngloader.cpp jpegloader.cpp tiffloader.cpp rawloader.cpp ppmloader.cpp + qimageloader.cpp iccjpeg.c jp2kloader.cpp jpegsettings.cpp pngsettings.cpp tiffsettings.cpp + jp2ksettings.cpp + LINK + curves-static dimgfilters-static histogram-static levels-static whitebalance-static tdecore-shared + ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} +) diff --git a/src/libs/dmetadata/CMakeLists.txt b/src/libs/dmetadata/CMakeLists.txt new file mode 100644 index 00000000..a5ed88b7 --- /dev/null +++ b/src/libs/dmetadata/CMakeLists.txt @@ -0,0 +1,14 @@ +##### dmetadata library (static) + +tde_add_library( dmetadata STATIC_PIC + SOURCES dmetadata.cpp + LINK dimg-static histogram-static tdecore-shared ${KEXIV2_LIBRARIES} +) + + +##### other files + +install( + FILES dmetadata.h photoinfocontainer.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/greycstoration/CMakeLists.txt b/src/libs/greycstoration/CMakeLists.txt new file mode 100644 index 00000000..528a0259 --- /dev/null +++ b/src/libs/greycstoration/CMakeLists.txt @@ -0,0 +1,20 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/dimg/filters +) + + +##### greycstoration library (static) + +tde_add_library( greycstoration STATIC_PIC AUTOMOC + SOURCES greycstorationiface.cpp greycstorationwidget.cpp + LINK dimgfilters-static histogram-static tdecore-shared ${CMAKE_THREAD_LIBS_INIT} +) + + +##### other files + +install( + FILES greycstorationiface.h greycstorationwidget.h greycstorationsettings.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/histogram/CMakeLists.txt b/src/libs/histogram/CMakeLists.txt new file mode 100644 index 00000000..7f7edbb9 --- /dev/null +++ b/src/libs/histogram/CMakeLists.txt @@ -0,0 +1,14 @@ +##### histogram library (static) + +tde_add_library( histogram STATIC_PIC + SOURCES imagehistogram.cpp + LINK tdecore-shared +) + + +##### other files + +install( + FILES imagehistogram.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/imageproperties/CMakeLists.txt b/src/libs/imageproperties/CMakeLists.txt new file mode 100644 index 00000000..81bd7fb8 --- /dev/null +++ b/src/libs/imageproperties/CMakeLists.txt @@ -0,0 +1,42 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/dialogs + ${CMAKE_SOURCE_DIR}/src/libs/themeengine + ${CMAKE_SOURCE_DIR}/src/libs/threadimageio + ${CMAKE_SOURCE_DIR}/src/libs/widgets/common + ${CMAKE_SOURCE_DIR}/src/libs/widgets/metadata + ${CMAKE_SOURCE_DIR}/src/libs/widgets/iccprofiles + ${CMAKE_SOURCE_DIR}/src/utilities/batch + ${CMAKE_SOURCE_DIR}/src/utilities/cameragui +) + + +##### imagepropertiesdigikam library (static) + +tde_add_library( imagepropertiesdigikam STATIC_PIC AUTOMOC + SOURCES + imagedescedittab.cpp imagepropertiessidebar.cpp imagepropertiessidebardb.cpp talbumlistview.cpp + imagepropertiesmetadatatab.cpp imagepropertiescolorstab.cpp navigatebarwidget.cpp + imagepropertiestab.cpp navigatebartab.cpp + LINK + histogram-static commonwidgets-static iccprofileswidgets-static tdecore-shared +) + +##### imagepropertiesshowfoto library (static) + +tde_add_library( imagepropertiesshowfoto STATIC_PIC AUTOMOC + SOURCES + imagepropertiessidebar.cpp navigatebarwidget.cpp imagepropertiesmetadatatab.cpp + imagepropertiescolorstab.cpp imagepropertiestab.cpp navigatebartab.cpp + LINK + metadatawidgets-static iccprofileswidgets-static imagepluginswidgets-static + commonwidgets-static dmetadata-static dimg-static threadimageio-static + histogram-static tdecore-shared +) + +##### imagepropertiescamgui library (static) + +tde_add_library( imagepropertiescamgui STATIC_PIC AUTOMOC + SOURCES imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp + LINK tdecore-shared +) diff --git a/src/libs/jpegutils/CMakeLists.txt b/src/libs/jpegutils/CMakeLists.txt new file mode 100644 index 00000000..338f2036 --- /dev/null +++ b/src/libs/jpegutils/CMakeLists.txt @@ -0,0 +1,6 @@ +##### jpegutils library (static) + +tde_add_library( jpegutils STATIC_PIC + SOURCES jpegutils.cpp transupp.cpp + LINK tdecore-shared ${JPEG_LIBRARIES} +) diff --git a/src/libs/jpegutils/jinclude.h b/src/libs/jpegutils/jinclude.h index adee51e0..6aa70c25 100644 --- a/src/libs/jpegutils/jinclude.h +++ b/src/libs/jpegutils/jinclude.h @@ -30,13 +30,8 @@ * You can remove those references if you want to compile without <stdio.h>. */ -#ifdef HAVE_STDDEF_H #include <stddef.h> -#endif - -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif #ifdef NEED_SYS_TYPES_H #include <sys/types.h> diff --git a/src/libs/levels/CMakeLists.txt b/src/libs/levels/CMakeLists.txt new file mode 100644 index 00000000..6d809574 --- /dev/null +++ b/src/libs/levels/CMakeLists.txt @@ -0,0 +1,14 @@ +##### levels library (static) + +tde_add_library( levels STATIC_PIC + SOURCES imagelevels.cpp + LINK histogram-static tdecore-shared +) + + +##### other files + +install( + FILES imagelevels.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/lprof/CMakeLists.txt b/src/libs/lprof/CMakeLists.txt new file mode 100644 index 00000000..92410201 --- /dev/null +++ b/src/libs/lprof/CMakeLists.txt @@ -0,0 +1,7 @@ +##### lprof library (static) + +tde_add_library( lprof STATIC_PIC + SOURCES + cmshull.cpp cmslm.cpp cmslnr.cpp cmsmatn.cpp cmsmkmsh.cpp cmsmntr.cpp + cmsoutl.cpp cmspcoll.cpp cmsprf.cpp cmsreg.cpp cmsscn.cpp cmssheet.cpp +) diff --git a/src/libs/sqlite2/CMakeLists.txt b/src/libs/sqlite2/CMakeLists.txt new file mode 100644 index 00000000..0f4a513b --- /dev/null +++ b/src/libs/sqlite2/CMakeLists.txt @@ -0,0 +1,9 @@ +##### sqlite2 library (static) + +tde_add_library( sqlite2 STATIC_PIC + SOURCES + attach.c auth.c btree.c btree_rb.c build.c copy.c date.c delete.c encode.c expr.c func.c hash.c + insert.c main.c opcodes.c os.c pager.c parse.c pragma.c printf.c random.c select.c shell.c + table.c tokenize.c trigger.c update.c util.c vacuum.c vdbe.c vdbeaux.c where.c + LINK ${CMAKE_THREAD_LIBS_INIT} +) diff --git a/src/libs/sqlite3/CMakeLists.txt b/src/libs/sqlite3/CMakeLists.txt new file mode 100644 index 00000000..f5211222 --- /dev/null +++ b/src/libs/sqlite3/CMakeLists.txt @@ -0,0 +1,6 @@ +##### sqlite3 library (static) + +tde_add_library( sqlite3 STATIC_PIC + SOURCES sqlite3.c + LINK ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} +) diff --git a/src/libs/sqlite3/sqlite3.c b/src/libs/sqlite3/sqlite3.c index 45077b4b..87195d9a 100644 --- a/src/libs/sqlite3/sqlite3.c +++ b/src/libs/sqlite3/sqlite3.c @@ -249,12 +249,8 @@ /* ** Include standard header files as necessary */ -#ifdef HAVE_STDINT_H #include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H #include <inttypes.h> -#endif /* ** A macro used to aid in coverage testing. When doing coverage diff --git a/src/libs/themeengine/CMakeLists.txt b/src/libs/themeengine/CMakeLists.txt new file mode 100644 index 00000000..9632df83 --- /dev/null +++ b/src/libs/themeengine/CMakeLists.txt @@ -0,0 +1,11 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### themeengine library (static) + +tde_add_library( themeengine STATIC_PIC AUTOMOC + SOURCES theme.cpp themeengine.cpp texture.cpp + LINK histogram-static tdecore-shared +) diff --git a/src/libs/threadimageio/CMakeLists.txt b/src/libs/threadimageio/CMakeLists.txt new file mode 100644 index 00000000..681286af --- /dev/null +++ b/src/libs/threadimageio/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/dimg/loaders + ${CMAKE_SOURCE_DIR}/src/libs/jpegutils +) + + +##### threadimageio library (static) + +tde_add_library( threadimageio STATIC_PIC AUTOMOC + SOURCES + loadsavethread.cpp managedloadsavethread.cpp sharedloadsavethread.cpp previewloadthread.cpp + loadingdescription.cpp loadsavetask.cpp previewtask.cpp loadingcache.cpp + loadingcacheinterface.cpp + LINK + tdecore-shared +) diff --git a/src/libs/thumbbar/CMakeLists.txt b/src/libs/thumbbar/CMakeLists.txt new file mode 100644 index 00000000..338fd181 --- /dev/null +++ b/src/libs/thumbbar/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} +) + + +##### thumbbar library (static) + +tde_add_library( thumbbar STATIC_PIC AUTOMOC + SOURCES thumbbar.cpp thumbnailjob.cpp + LINK tdecore-shared +) + + +##### other files + +install( + FILES thumbbar.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/whitebalance/CMakeLists.txt b/src/libs/whitebalance/CMakeLists.txt new file mode 100644 index 00000000..8cb43561 --- /dev/null +++ b/src/libs/whitebalance/CMakeLists.txt @@ -0,0 +1,14 @@ +##### whitebalance library (static) + +tde_add_library( whitebalance STATIC_PIC + SOURCES whitebalance.cpp + LINK histogram-static tdecore-shared +) + + +##### other files + +install( + FILES whitebalance.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/widgets/CMakeLists.txt b/src/libs/widgets/CMakeLists.txt new file mode 100644 index 00000000..b9c0301e --- /dev/null +++ b/src/libs/widgets/CMakeLists.txt @@ -0,0 +1,6 @@ +##### subfolders + +add_subdirectory( common ) +add_subdirectory( iccprofiles ) +add_subdirectory( imageplugins ) +add_subdirectory( metadata ) diff --git a/src/libs/widgets/common/CMakeLists.txt b/src/libs/widgets/common/CMakeLists.txt new file mode 100644 index 00000000..c72bc242 --- /dev/null +++ b/src/libs/widgets/common/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/curves + ${CMAKE_SOURCE_DIR}/src/libs/dimg/loaders +) + + +##### commonwidgets library (static) + +tde_add_library( commonwidgets STATIC_PIC AUTOMOC + SOURCES + histogramwidget.cpp colorgradientwidget.cpp curveswidget.cpp dlogoaction.cpp sidebar.cpp + squeezedcombobox.cpp filesaveoptionsbox.cpp dpopupmenu.cpp statuszoombar.cpp + statusnavigatebar.cpp statusprogressbar.cpp searchtextbar.cpp dcursortracker.cpp + paniconwidget.cpp previewwidget.cpp splashscreen.cpp statusled.cpp + LINK + tdecore-shared tdeui-shared +) + + +##### other files + +install( + FILES + histogramwidget.h colorgradientwidget.h curveswidget.h sidebar.h dlogoaction.h + squeezedcombobox.h dpopupmenu.h statuszoombar.h statusnavigatebar.h searchtextbar.h + statusprogressbar.h dcursortracker.h paniconwidget.h previewwidget.h statusled.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/widgets/common/dlogoaction.cpp b/src/libs/widgets/common/dlogoaction.cpp index 60cfd77f..73bf4b7d 100644 --- a/src/libs/widgets/common/dlogoaction.cpp +++ b/src/libs/widgets/common/dlogoaction.cpp @@ -39,6 +39,7 @@ #include "daboutdata.h" #include "dlogoaction.h" +#include "dlogoaction.moc" namespace Digikam { diff --git a/src/libs/widgets/iccprofiles/CMakeLists.txt b/src/libs/widgets/iccprofiles/CMakeLists.txt new file mode 100644 index 00000000..a17a9ab1 --- /dev/null +++ b/src/libs/widgets/iccprofiles/CMakeLists.txt @@ -0,0 +1,22 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/lprof + ${CMAKE_SOURCE_DIR}/src/libs/widgets/common + ${CMAKE_SOURCE_DIR}/src/libs/widgets/metadata +) + + +##### iccprofileswidgets library (static) + +tde_add_library( iccprofileswidgets STATIC_PIC AUTOMOC + SOURCES iccprofilewidget.cpp cietonguewidget.cpp iccpreviewwidget.cpp + LINK lprof-static metadatawidgets-static tdecore-shared +) + + +##### other files + +install( + FILES cietonguewidget.h iccprofilewidget.h iccpreviewwidget.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/widgets/imageplugins/CMakeLists.txt b/src/libs/widgets/imageplugins/CMakeLists.txt new file mode 100644 index 00000000..a3c77983 --- /dev/null +++ b/src/libs/widgets/imageplugins/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/widgets/common + ${CMAKE_SOURCE_DIR}/src/utilities/imageeditor/editor +) + + +##### imagepluginswidgets library (static) + +tde_add_library( imagepluginswidgets STATIC_PIC AUTOMOC + SOURCES + imageregionwidget.cpp imagepaniconwidget.cpp imageguidewidget.cpp imagewidget.cpp + listboxpreviewitem.cpp imagepanelwidget.cpp + LINK + dimgeditor-static tdecore-shared +) + + +##### other files + +install( + FILES + imageregionwidget.h imagepaniconwidget.h imagepanelwidget.h imageguidewidget.h + listboxpreviewitem.h imagewidget.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/src/libs/widgets/metadata/CMakeLists.txt b/src/libs/widgets/metadata/CMakeLists.txt new file mode 100644 index 00000000..9c7b5488 --- /dev/null +++ b/src/libs/widgets/metadata/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src/libs/themeengine + ${CMAKE_SOURCE_DIR}/src/libs/widgets/common +) + + +##### metadatawidgets library (static) + +tde_add_library( metadatawidgets STATIC_PIC AUTOMOC + SOURCES + metadatalistview.cpp metadatalistviewitem.cpp metadatawidget.cpp iptcwidget.cpp exifwidget.cpp + mdkeylistviewitem.cpp makernotewidget.cpp gpswidget.cpp worldmapwidget.cpp + LINK + tdecore-shared +) |