[PATCH] digikam trunk link fix for kde4
Locked
[PATCH] digikam trunk link fix for kde4
 
|
something must have changed in the cmake build system in svn trunk,
digikam trunk doesn't link appropriately under kde trunk (shows loads of missing qt and kde symbols). I have added the necessary missing libraries manually one by one as each part failed linking, and made it link. I attach a diff that fixes the whole building, but I'm sure the fix can be done in a better way. Anyone knows cmake better than me to do a proper fix? =) Index: imageplugins/hotpixels/CMakeLists.txt =================================================================== --- imageplugins/hotpixels/CMakeLists.txt (revision 852578) +++ imageplugins/hotpixels/CMakeLists.txt (working copy) @@ -9,7 +9,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_hotpixels ${digikamimageplugin_hotpixels_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_hotpixels digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_hotpixels digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_hotpixels DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/oilpaint/CMakeLists.txt =================================================================== --- imageplugins/oilpaint/CMakeLists.txt (revision 852578) +++ imageplugins/oilpaint/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_oilpaint ${digikamimageplugin_oilpaint_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_oilpaint digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_oilpaint digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_oilpaint DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/adjustcurves/CMakeLists.txt =================================================================== --- imageplugins/adjustcurves/CMakeLists.txt (revision 852578) +++ imageplugins/adjustcurves/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_adjustcurves ${digikamimageplugin_adjustcurves_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_adjustcurves digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_adjustcurves digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_adjustcurves DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/whitebalance/CMakeLists.txt =================================================================== --- imageplugins/whitebalance/CMakeLists.txt (revision 852578) +++ imageplugins/whitebalance/CMakeLists.txt (working copy) @@ -6,7 +6,8 @@ KDE4_ADD_PLUGIN(digikamimageplugin_whitebalance ${digikamimageplugin_whitebalance_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_whitebalance digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_whitebalance digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} +) INSTALL(TARGETS digikamimageplugin_whitebalance DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/emboss/CMakeLists.txt =================================================================== --- imageplugins/emboss/CMakeLists.txt (revision 852578) +++ imageplugins/emboss/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_emboss ${digikamimageplugin_emboss_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_emboss digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_emboss digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_emboss DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/lenscorrection/CMakeLists.txt =================================================================== --- imageplugins/lenscorrection/CMakeLists.txt (revision 852578) +++ imageplugins/lenscorrection/CMakeLists.txt (working copy) @@ -30,7 +30,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_lenscorrection ${digikamimageplugin_lenscorrection_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_lenscorrection digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_lenscorrection digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) IF(LENSFUN_LIBRARY) TARGET_LINK_LIBRARIES(digikamimageplugin_lenscorrection lensfun) Index: imageplugins/perspective/CMakeLists.txt =================================================================== --- imageplugins/perspective/CMakeLists.txt (revision 852578) +++ imageplugins/perspective/CMakeLists.txt (working copy) @@ -9,7 +9,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_perspective ${digikamimageplugin_perspective_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_perspective digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_perspective digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_perspective DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/infrared/CMakeLists.txt =================================================================== --- imageplugins/infrared/CMakeLists.txt (revision 852578) +++ imageplugins/infrared/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_infrared ${digikamimageplugin_infrared_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_infrared digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_infrared digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_infrared DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/noisereduction/CMakeLists.txt =================================================================== --- imageplugins/noisereduction/CMakeLists.txt (revision 852578) +++ imageplugins/noisereduction/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_noisereduction ${digikamimageplugin_noisereduction_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_noisereduction digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_noisereduction digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_noisereduction DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/distortionfx/CMakeLists.txt =================================================================== --- imageplugins/distortionfx/CMakeLists.txt (revision 852578) +++ imageplugins/distortionfx/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_distortionfx ${digikamimageplugin_distortionfx_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_distortionfx digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_distortionfx digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_distortionfx DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/inpainting/CMakeLists.txt =================================================================== --- imageplugins/inpainting/CMakeLists.txt (revision 852578) +++ imageplugins/inpainting/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_inpainting ${digikamimageplugin_inpainting_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_inpainting digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_inpainting digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_inpainting DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/sheartool/CMakeLists.txt =================================================================== --- imageplugins/sheartool/CMakeLists.txt (revision 852578) +++ imageplugins/sheartool/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_sheartool ${digikamimageplugin_sheartool_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_sheartool digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_sheartool digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_sheartool DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/texture/CMakeLists.txt =================================================================== --- imageplugins/texture/CMakeLists.txt (revision 852578) +++ imageplugins/texture/CMakeLists.txt (working copy) @@ -9,7 +9,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_texture ${digikamimageplugin_texture_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_texture digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_texture digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_texture DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/freerotation/CMakeLists.txt =================================================================== --- imageplugins/freerotation/CMakeLists.txt (revision 852578) +++ imageplugins/freerotation/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_freerotation ${digikamimageplugin_freerotation_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_freerotation digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_freerotation digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_freerotation DESTINATION ${PLUGIN_INSTALL_DIR} ) Index: imageplugins/blurfx/CMakeLists.txt =================================================================== --- imageplugins/blurfx/CMakeLists.txt (revision 852578) +++ imageplugins/blurfx/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_blurfx ${digikamimageplugin_blurfx_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_blurfx digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_blurfx digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_blurfx DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/adjustlevels/CMakeLists.txt =================================================================== --- imageplugins/adjustlevels/CMakeLists.txt (revision 852578) +++ imageplugins/adjustlevels/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_adjustlevels ${digikamimageplugin_adjustlevels_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_adjustlevels digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_adjustlevels digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_adjustlevels DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/coreplugin/CMakeLists.txt =================================================================== --- imageplugins/coreplugin/CMakeLists.txt (revision 852578) +++ imageplugins/coreplugin/CMakeLists.txt (working copy) @@ -67,7 +67,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_core ${digikamimageplugin_core_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_core digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_core digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_core DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/filmgrain/CMakeLists.txt =================================================================== --- imageplugins/filmgrain/CMakeLists.txt (revision 852578) +++ imageplugins/filmgrain/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_filmgrain ${digikamimageplugin_filmgrain_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_filmgrain digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_filmgrain digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_filmgrain DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/inserttext/CMakeLists.txt =================================================================== --- imageplugins/inserttext/CMakeLists.txt (revision 852578) +++ imageplugins/inserttext/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_inserttext ${digikamimageplugin_inserttext_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_inserttext digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_inserttext digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_inserttext DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/restoration/CMakeLists.txt =================================================================== --- imageplugins/restoration/CMakeLists.txt (revision 852578) +++ imageplugins/restoration/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_restoration ${digikamimageplugin_restoration_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_restoration digikam ) +TARGET_LINK_LIBRARIES(digikamimageplugin_restoration digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_restoration DESTINATION ${PLUGIN_INSTALL_DIR} ) Index: imageplugins/superimpose/CMakeLists.txt =================================================================== --- imageplugins/superimpose/CMakeLists.txt (revision 852578) +++ imageplugins/superimpose/CMakeLists.txt (working copy) @@ -9,7 +9,8 @@ KDE4_ADD_PLUGIN(digikamimageplugin_superimpose ${digikamimageplugin_superimpose_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_superimpose digikam ${KDE4_KFILE_LIBS}) +TARGET_LINK_LIBRARIES(digikamimageplugin_superimpose digikam ${KDE4_KFILE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} +) INSTALL(TARGETS digikamimageplugin_superimpose DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/colorfx/CMakeLists.txt =================================================================== --- imageplugins/colorfx/CMakeLists.txt (revision 852578) +++ imageplugins/colorfx/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_colorfx ${digikamimageplugin_colorfx_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_colorfx digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_colorfx digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_colorfx DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/charcoal/CMakeLists.txt =================================================================== --- imageplugins/charcoal/CMakeLists.txt (revision 852578) +++ imageplugins/charcoal/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_charcoal ${digikamimageplugin_charcoal_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_charcoal digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_charcoal digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_charcoal DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/channelmixer/CMakeLists.txt =================================================================== --- imageplugins/channelmixer/CMakeLists.txt (revision 852578) +++ imageplugins/channelmixer/CMakeLists.txt (working copy) @@ -6,7 +6,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_channelmixer ${digikamimageplugin_channelmixer_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_channelmixer digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_channelmixer digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS} ${KDCRAW_LIBRARIES}) INSTALL(TARGETS digikamimageplugin_channelmixer DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/border/CMakeLists.txt =================================================================== --- imageplugins/border/CMakeLists.txt (revision 852578) +++ imageplugins/border/CMakeLists.txt (working copy) @@ -9,7 +9,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_border ${digikamimageplugin_border_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_border digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_border digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_border DESTINATION ${PLUGIN_INSTALL_DIR}) Index: imageplugins/raindrop/CMakeLists.txt =================================================================== --- imageplugins/raindrop/CMakeLists.txt (revision 852578) +++ imageplugins/raindrop/CMakeLists.txt (working copy) @@ -7,7 +7,7 @@ KDE4_ADD_PLUGIN(digikamimageplugin_raindrop ${digikamimageplugin_raindrop_PART_SRCS}) -TARGET_LINK_LIBRARIES(digikamimageplugin_raindrop digikam) +TARGET_LINK_LIBRARIES(digikamimageplugin_raindrop digikam ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBS}) INSTALL(TARGETS digikamimageplugin_raindrop DESTINATION ${PLUGIN_INSTALL_DIR}) Index: kioslave/CMakeLists.txt =================================================================== --- kioslave/CMakeLists.txt (revision 852578) +++ kioslave/CMakeLists.txt (working copy) @@ -16,6 +16,7 @@ TARGET_LINK_LIBRARIES(kio_digikamtags digikam digikamdatabase + ${KDE4_KIO_LIBS} ) # # digiKam Albums kio slave ######################################################### @@ -27,6 +28,7 @@ TARGET_LINK_LIBRARIES(kio_digikamalbums digikam digikamdatabase + ${KDE4_KIO_LIBS} ) # # digiKam Date kio slave ########################################################### @@ -38,6 +40,7 @@ TARGET_LINK_LIBRARIES(kio_digikamdates digikam digikamdatabase + ${KDE4_KIO_LIBS} ) # # digiKam Search kio slave ######################################################### @@ -50,6 +53,7 @@ TARGET_LINK_LIBRARIES(kio_digikamsearch digikam digikamdatabase + ${KDE4_KIO_LIBS} ) # Files to install ################################################################# Index: digikam/CMakeLists.txt =================================================================== --- digikam/CMakeLists.txt (revision 852578) +++ digikam/CMakeLists.txt (working copy) @@ -145,8 +145,14 @@ TARGET_LINK_LIBRARIES(digikamdatabase digikam + ${QT_QTCORE_LIBRARY} + ${KDE4_KDECORE_LIBS} + ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_SOLID_LIBS} + ${KEXIV2_LIBRARIES} + ${KDCRAW_LIBRARIES} + ${KDE4_KIO_LIBS} ) SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 ) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
Unai,
I cannot reproduce the problem here. Your patch sound like plugin and kioslave are not linked with libdigikam.la. It's sound strange. perhaps you have a cmake cache problem ? Are you tried to compile all from scratch ? Gilles 2008/8/26 Unai Garro <[hidden email]>: > something must have changed in the cmake build system in svn trunk, digikam > trunk doesn't link appropriately under kde trunk (shows loads of missing qt > and kde symbols). > I have added the necessary missing libraries manually one by one as each > part failed linking, and made it link. > I attach a diff that fixes the whole building, but I'm sure the fix can be > done in a better way. Anyone knows cmake better than me to do a proper fix? > =) > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel > > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
I also can not confirm this here... works like a charm... well it just
works :-) Andi On Tuesday 26 August 2008 09:20:17 Gilles Caulier wrote: > Unai, > > I cannot reproduce the problem here. Your patch sound like plugin and > kioslave are not linked with libdigikam.la. It's sound strange. > perhaps you have a cmake cache problem ? Are you tried to compile all > from scratch ? > > Gilles > > 2008/8/26 Unai Garro <[hidden email]>: > > something must have changed in the cmake build system in svn trunk, > > digikam trunk doesn't link appropriately under kde trunk (shows loads of > > missing qt and kde symbols). > > I have added the necessary missing libraries manually one by one as each > > part failed linking, and made it link. > > I attach a diff that fixes the whole building, but I'm sure the fix can > > be done in a better way. Anyone knows cmake better than me to do a proper > > fix? =) > > > > _______________________________________________ > > Digikam-devel mailing list > > [hidden email] > > https://mail.kde.org/mailman/listinfo/digikam-devel > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
In reply to this post by Bugzilla from ugarro@gmail.com
That's strange. I was able to build digikam before, too, without this patch.
I tried cleaning up the build dir, and I run on latest kde from svn trunk, but no luck. Have you updated recently? Somehow those libraries (mostly image plugins and kios) don't get linked to basic libraries like Qt even. I'm on cmake 2.6, if that makes any difference. Andi Clemens wrote: > I also can not confirm this here... works like a charm... well it just > works :-) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
2008/8/26 Unai Garro <[hidden email]>:
> That's strange. I was able to build digikam before, too, without this patch. > I tried cleaning up the build dir, and I run on latest kde from svn > trunk, but no luck. Have you updated recently? > > Somehow those libraries (mostly image plugins and kios) don't get linked > to basic libraries like Qt even. > > I'm on cmake 2.6, if that makes any difference. > I use also this version into Mandriva 2009.0 beta2 Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
In reply to this post by Bugzilla from ugarro@gmail.com
I forgot pasting the linking errors I get... http://rafb.net/p/JiwVhI41.html
The list continues, that's the starting of the link failures. As you can see, it does not even link to qtcore > That's strange. I was able to build digikam before, too, without this > patch. > I tried cleaning up the build dir, and I run on latest kde from svn > trunk, but no luck. Have you updated recently? > > Somehow those libraries (mostly image plugins and kios) don't get > linked to basic libraries like Qt even. > > I'm on cmake 2.6, if that makes any difference. > > Andi Clemens wrote: >> I also can not confirm this here... works like a charm... well it just >> works :-) _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
In reply to this post by Gilles Caulier-4
Also using latest trunk and cmake 2.6 Andi On Tuesday 26 August 2008 13:19:12 Gilles Caulier wrote: > 2008/8/26 Unai Garro <[hidden email]>: > > That's strange. I was able to build digikam before, too, without this > > patch. I tried cleaning up the build dir, and I run on latest kde from > > svn trunk, but no luck. Have you updated recently? > > > > Somehow those libraries (mostly image plugins and kios) don't get linked > > to basic libraries like Qt even. > > > > I'm on cmake 2.6, if that makes any difference. > > I use also this version into Mandriva 2009.0 beta2 > > Gilles > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
In reply to this post by Bugzilla from ugarro@gmail.com
Maybe you need to rerun configuration? Go into build dir, type ccmake . press c if everything went well press g run make again. By cleaning up the build dir you mean you removed it or just run "make clean"? This does sometimes not work. Try the above steps, also try to update the cmake folder inside of the graphics dir. And of course the CmakeLists.txt in graphics dir. Andi On Tuesday 26 August 2008 13:22:12 Unai Garro wrote: > I forgot pasting the linking errors I get... > http://rafb.net/p/JiwVhI41.html > > The list continues, that's the starting of the link failures. As you can > see, it does not even link to qtcore > > > That's strange. I was able to build digikam before, too, without this > > patch. > > I tried cleaning up the build dir, and I run on latest kde from svn > > trunk, but no luck. Have you updated recently? > > > > Somehow those libraries (mostly image plugins and kios) don't get > > linked to basic libraries like Qt even. > > > > I'm on cmake 2.6, if that makes any difference. > > > > Andi Clemens wrote: > >> I also can not confirm this here... works like a charm... well it just > >> works :-) > > _______________________________________________ > Digikam-devel mailing list > [hidden email] > https://mail.kde.org/mailman/listinfo/digikam-devel _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: [PATCH] digikam trunk link fix for kde4
|
|
In reply to this post by Bugzilla from ugarro@gmail.com
By cleaning, I mean:
svn revert -R *, and svn-clean-kde in source code, and rm -rf builddir/extragear/graphics So nothing is left. no cache nor anything, and the code is clean, like a new checkout Andi Clemens wrote: > By cleaning up the build dir you mean you removed it or just run "make clean"? _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
«
Return to digikam-devel
|
1 view|%1 views
| Free forum by Nabble | Edit this page |