[Digikam-devel] Re: extragear/graphics/digikam
Andi Clemens
andi.clemens at gmx.net
Mon Nov 8 11:28:51 GMT 2010
I forgot to commit a file, sorry!
Right now I am creating some static libs for queuemanager, dimg filters etc in
a local branch.
I guess this really helps understanding the build process a little bit more
and also reduces compile time. What do you think?
Andi Clemens
-----------------
www.digikam.org
On Monday 08 November 2010 11:38:54 Gilles Caulier wrote:
> It doen't work here, after a fresh checkout :
>
> [ 45%] Building CXX object
> digikam/digikam/CMakeFiles/digikam.dir/__/libs/dialogs/migrationdlg.o
> [ 45%] Building CXX object
> digikam/digikam/CMakeFiles/digikam.dir/main.o
> [ 45%] Building CXX object
> digikam/digikam/CMakeFiles/digikam.dir/digikamadaptor.o
> Linking CXX executable digikam
> /usr/bin/ld: cannot find -ladvancedrename
> collect2: ld returned 1 exit status
> make[2]: *** [digikam/digikam/digikam] Error 1
> make[1]: *** [digikam/digikam/CMakeFiles/digikam.dir/all] Error 2
> make: *** [all] Error 2
>
> Gilles Caulier
>
> 2010/11/8 Andi Clemens <andi.clemens at gmx.net>:
> > SVN commit 1194106 by aclemens:
> >
> > Create a static lib for advancedrename. This prevents recompiling of the
> > object files when building the test suite or the themedesigner. Right
> > now when the themedesigner target is build, nearly all objects from the
> > digiKam target are recompiled again, which is a waste of time.
> > We should create static libs for all the libXXX_SRCS variables in the
> > main CMakeLists.txt file. I also think we should remove those
> > libXXX_SRCS variables from there completely, they have nothing to do in
> > there and make the code hard to understand.
> >
> > Right now I only created a static lib for advancedrename, but in the
> > future we should do this for all the other so called "libs", too.
> >
> > CCMAIL: digikam-devel at kde.org
> >
> > M +0 -41 CMakeLists.txt
> > M +1 -6 digikam/CMakeLists.txt
> > M +1 -1 tests/CMakeLists.txt
> > M +1 -1 themedesigner/CMakeLists.txt
> > M +1 -0 utilities/CMakeLists.txt
> >
> >
> > --- trunk/extragear/graphics/digikam/CMakeLists.txt #1194105:1194106
> > @@ -1284,47 +1284,6 @@
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/timeline/timelinewidget.cpp
> > )
> >
> > - SET(libadvancedrename_SRCS
> > -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamedial
> > og.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenameinpu
> > t.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamemana
> > ger.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewidg
> > et.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamiclayo
> > ut.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlighter
> > .cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier.cp
> > p -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cpp
> > -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable.c
> > pp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseabledi
> > alog.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cpp
> > -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresult
> > s.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethrea
> > d.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp -
> >
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcrea
> > tor.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdial
> > og.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultrena
> > meparser.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importrenam
> > eparser.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/c
> > asemodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/d
> > efaultvaluemodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/r
> > angemodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/r
> > emovedoublesmodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/r
> > eplacemodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/t
> > rimmedmodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/u
> > niquemodifier.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/cam
> > eranameoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/databaseoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/dbheaderlistitem.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/dbkeyscollection.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/dbkeyselector.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/keys/commonkeys.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/keys/metadatakeys.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > abase/keys/positionkeys.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dat
> > eoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dir
> > ectorynameoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/fil
> > epropertiesoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/met
> > adataoption.cpp -
> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/seq
> > uencenumberoption.cpp - )
> > -
> > SET(libdigikamgui_SRCS
> > ${CMAKE_CURRENT_SOURCE_DIR}/digikam/addtagslineedit.cpp
> > ${CMAKE_CURRENT_SOURCE_DIR}/digikam/album.cpp
> > --- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt
> > #1194105:1194106 @@ -157,11 +157,6 @@
> > )
> >
> > KDE4_ADD_UI_FILES(digikamcore_LIB_SRCS
> > -
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifier
> > s/fillmodifierdialogwidget.ui -
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifier
> > s/replacemodifierdialogwidget.ui -
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifier
> > s/rangemodifierdialogwidget.ui -
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/options/
> > dateoptiondialogwidget.ui -
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/options/
> > sequencenumberoptiondialogwidget.ui
> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printopt
> > ionspage.ui )
> >
> > @@ -324,7 +319,6 @@
> > ${libdigikamgui_SRCS}
> > ${libfirstrun_SRCS}
> > ${libtemplate_SRCS}
> > - ${libadvancedrename_SRCS}
> > ${libdatabaseui_SRCS}
> >
> > main.cpp
> > @@ -353,6 +347,7 @@
> > ${GPHOTO2_LIBRARIES}
> > digikamcore
> > digikamdatabase
> > + advancedrename
> > )
> >
> > IF(KDEPIMLIBS_FOUND)
> > --- trunk/extragear/graphics/digikam/tests/CMakeLists.txt
> > #1194105:1194106 @@ -49,7 +49,6 @@
> >
> > SET(advancedrenametest_SRCS
> > advancedrenametest.cpp
> > - ${libadvancedrename_SRCS}
> > )
> > KDE4_ADD_UNIT_TEST(advancedrenametest ${advancedrenametest_SRCS})
> > TARGET_LINK_LIBRARIES(advancedrenametest
> > @@ -60,6 +59,7 @@
> > ${QT_QTTEST_LIBRARY}
> > digikamdatabase
> > digikamcore
> > + advancedrename
> > )
> >
> > #-----------------------------------------------------------------------
> > - --- trunk/extragear/graphics/digikam/themedesigner/CMakeLists.txt
> > #1194105:1194106 @@ -101,7 +101,6 @@
> > ${libdigikamgui_SRCS}
> > ${libqueuemanager_SRCS}
> > ${libalbummodels_SRCS}
> > - ${libadvancedrename_SRCS}
> > ${libtemplate_SRCS}
> > ${libdatabaseui_SRCS}
> >
> > @@ -120,6 +119,7 @@
> > TARGET_LINK_LIBRARIES(digikamthemedesigner
> > digikamcore
> > digikamdatabase
> > + advancedrename
> > ${KDE4_KPARTS_LIBS}
> > ${KDE4_PHONON_LIBS}
> > ${KDE4_KHTML_LIBS}
> > --- trunk/extragear/graphics/digikam/utilities/CMakeLists.txt
> > #1194105:1194106 @@ -4,3 +4,4 @@
> > ADD_SUBDIRECTORY(lighttable)
> > ADD_SUBDIRECTORY(cameragui)
> > ADD_SUBDIRECTORY(queuemanager)
> > +ADD_SUBDIRECTORY(advancedrename)
> > _______________________________________________
> > Digikam-devel mailing list
> > Digikam-devel at kde.org
> > https://mail.kde.org/mailman/listinfo/digikam-devel
>
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
More information about the Digikam-devel
mailing list