extragear/graphics/digikam
Locked
extragear/graphics/digikam
 
|
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: [hidden email] 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/advancedrenamedialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenameinput.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamemanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamiclayout.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlighter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseabledialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresults.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethread.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcreator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultrenameparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importrenameparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/casemodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/rangemodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/replacemodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/cameranameoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/databaseoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbkeyselector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dateoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/directorynameoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/filepropertiesoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/metadataoption.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/sequencenumberoption.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/modifiers/fillmodifierdialogwidget.ui - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/replacemodifierdialogwidget.ui - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/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/printoptionspage.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 [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
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 <[hidden email]>: > 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: [hidden email] > > 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/advancedrenamedialog.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenameinput.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamemanager.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewidget.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamiclayout.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlighter.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseabledialog.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresults.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethread.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcreator.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdialog.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultrenameparser.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importrenameparser.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/casemodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/defaultvaluemodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/rangemodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/removedoublesmodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/replacemodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/trimmedmodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifiers/uniquemodifier.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/cameranameoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/databaseoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbheaderlistitem.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbkeyscollection.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/dbkeyselector.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/commonkeys.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/database/keys/positionkeys.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/dateoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/directorynameoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/filepropertiesoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/metadataoption.cpp > - ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/sequencenumberoption.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/modifiers/fillmodifierdialogwidget.ui > - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/replacemodifierdialogwidget.ui > - ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifiers/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/printoptionspage.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 > [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: extragear/graphics/digikam
|
|
hmm weird I also did a fresh checkout just to check it.
I use a out-of-source build, e.g. I build in a "build-debugfull" folder outside the soure tree. 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 <[hidden email]>: > > 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: [hidden email] > > > > 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 > > [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: extragear/graphics/digikam
|
|
In reply to this post by Gilles Caulier-4
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 <[hidden email]>: > > 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: [hidden email] > > > > 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 > > [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: extragear/graphics/digikam
|
|
This want mean that more static libs files will be installed on the
system, as libdigikam.so ? Other project work like this, as Amarok ? Perhaps packagers can comment this. What's about static lib revision ID ? Gilles 2010/11/8 Andi Clemens <[hidden email]>: > 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 <[hidden email]>: >> > 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: [hidden email] >> > >> > 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 >> > [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 > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
those libs will not be installed at all, they are just used for compiling the
digiKam, test suite and digiKamthemedesigner targets. But it will prevent recompiling the object files over and over again. For example try compiling the themedesigner: it will compile the queuemanager again, all dimg filter, advanced rename, etc... and I don't even know why there are such weird dependencies at all, why does the themedesigner need BQM? By putting all the little subprobjects into static libs, we can avoid recompilation. Again, these static libs are used only for building, not for later usage at runtime. So there are no changes for packagers at all. Andi Clemens ----------------- www.digikam.org On Monday 08 November 2010 12:39:56 Gilles Caulier wrote: > This want mean that more static libs files will be installed on the > system, as libdigikam.so ? > > Other project work like this, as Amarok ? > > Perhaps packagers can comment this. > > What's about static lib revision ID ? > > Gilles > > 2010/11/8 Andi Clemens <[hidden email]>: > > 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 <[hidden email]>: > >> > 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: [hidden email] > >> > > >> > 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/advancedrenamedi > >> > al og.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamein > >> > pu t.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamema > >> > na ger.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewi > >> > dg et.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamicla > >> > yo ut.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlight > >> > er .cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier. > >> > cp p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cp > >> > p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable > >> > .c pp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable > >> > di alog.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cp > >> > p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresu > >> > lt s.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethr > >> > ea d.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp > >> > - > >> > > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcr > >> > ea tor.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdi > >> > al og.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultre > >> > na meparser.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importren > >> > am 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/c > >> > am eranameoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/databaseoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbheaderlistitem.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbkeyscollection.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbkeyselector.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/commonkeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/metadatakeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/positionkeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at eoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > ir ectorynameoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/f > >> > il epropertiesoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/m > >> > et adataoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/s > >> > eq 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/modifi > >> > er s/fillmodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi > >> > er s/replacemodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi > >> > er s/rangemodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option > >> > s/ dateoptiondialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option > >> > s/ sequencenumberoptiondialogwidget.ui > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printo > >> > pt 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 > >> > [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 > > _______________________________________________ > 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: extragear/graphics/digikam
|
|
2010/11/8 Andi Clemens <[hidden email]>:
> those libs will not be installed at all, they are just used for compiling the > digiKam, test suite and digiKamthemedesigner targets. > But it will prevent recompiling the object files over and over again. > Ah fine. I remember a similar way used with KDE3/Qt3 version before Cmake port. Fine for me. Another tool which need this way is dng converter for example > For example try compiling the themedesigner: > it will compile the queuemanager again, all dimg filter, advanced rename, > etc... and I don't even know why there are such weird dependencies at all, why > does the themedesigner need BQM? I remember some broken compilation without. But it's can be different now. > > By putting all the little subprobjects into static libs, we can avoid > recompilation. Again, these static libs are used only for building, not for > later usage at runtime. So there are no changes for packagers at all. Lets go well... Gilles Caulier > > Andi Clemens > ----------------- > www.digikam.org > > On Monday 08 November 2010 12:39:56 Gilles Caulier wrote: >> This want mean that more static libs files will be installed on the >> system, as libdigikam.so ? >> >> Other project work like this, as Amarok ? >> >> Perhaps packagers can comment this. >> >> What's about static lib revision ID ? >> >> Gilles >> >> 2010/11/8 Andi Clemens <[hidden email]>: >> > 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 <[hidden email]>: >> >> > 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: [hidden email] >> >> > >> >> > 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/advancedrenamedi >> >> > al og.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamein >> >> > pu t.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamema >> >> > na ger.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewi >> >> > dg et.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamicla >> >> > yo ut.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlight >> >> > er .cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier. >> >> > cp p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cp >> >> > p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable >> >> > .c pp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable >> >> > di alog.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cp >> >> > p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresu >> >> > lt s.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethr >> >> > ea d.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp >> >> > - >> >> > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcr >> >> > ea tor.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdi >> >> > al og.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultre >> >> > na meparser.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importren >> >> > am 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/c >> >> > am eranameoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/databaseoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbheaderlistitem.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbkeyscollection.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbkeyselector.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/commonkeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/metadatakeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/positionkeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at eoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > ir ectorynameoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/f >> >> > il epropertiesoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/m >> >> > et adataoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/s >> >> > eq 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/modifi >> >> > er s/fillmodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi >> >> > er s/replacemodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi >> >> > er s/rangemodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option >> >> > s/ dateoptiondialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option >> >> > s/ sequencenumberoptiondialogwidget.ui >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printo >> >> > pt 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 >> >> > [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 >> >> _______________________________________________ >> 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: extragear/graphics/digikam
|
|
I'd also like to use one big INCLUDE_DIRECTORIES in the main CMakeLists.txt
file. This way we don't have to add the include dirs over and over again in all the subprojects like it is now. If something changes in the source tree, we need to change at least 12 CMakeLists.txt files, having one section in the main file will prevent this. No need to redefine this over and over again. Andi Clemens ----------------- www.digikam.org On Monday 08 November 2010 12:57:54 Gilles Caulier wrote: > 2010/11/8 Andi Clemens <[hidden email]>: > > those libs will not be installed at all, they are just used for compiling > > the digiKam, test suite and digiKamthemedesigner targets. > > But it will prevent recompiling the object files over and over again. > > Ah fine. I remember a similar way used with KDE3/Qt3 version before > Cmake port. Fine for me. > > Another tool which need this way is dng converter for example > > > For example try compiling the themedesigner: > > it will compile the queuemanager again, all dimg filter, advanced rename, > > etc... and I don't even know why there are such weird dependencies at > > all, why does the themedesigner need BQM? > > I remember some broken compilation without. But it's can be different now. > > > By putting all the little subprobjects into static libs, we can avoid > > recompilation. Again, these static libs are used only for building, not > > for later usage at runtime. So there are no changes for packagers at > > all. > > Lets go well... > > Gilles Caulier > > > Andi Clemens > > ----------------- > > www.digikam.org > > > > On Monday 08 November 2010 12:39:56 Gilles Caulier wrote: > >> This want mean that more static libs files will be installed on the > >> system, as libdigikam.so ? > >> > >> Other project work like this, as Amarok ? > >> > >> Perhaps packagers can comment this. > >> > >> What's about static lib revision ID ? > >> > >> Gilles > >> > >> 2010/11/8 Andi Clemens <[hidden email]>: > >> > 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 <[hidden email]>: > >> >> > 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: [hidden email] > >> >> > > >> >> > 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/advancedrenam > >> >> > edi al og.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ein pu t.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ema na ger.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ewi dg et.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynami > >> >> > cla yo ut.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highli > >> >> > ght er .cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifi > >> >> > er. cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option > >> >> > .cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea > >> >> > ble .c pp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea > >> >> > ble di alog.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser > >> >> > .cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser > >> >> > esu lt s.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/rename > >> >> > thr ea d.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token. > >> >> > cpp - > >> >> > > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti > >> >> > pcr ea tor.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti > >> >> > pdi al og.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaul > >> >> > tre na meparser.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/import > >> >> > ren am eparser.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /c asemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /d efaultvaluemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r angemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r emovedoublesmodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r eplacemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /t rimmedmodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /u niquemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/c am eranameoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/databaseoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbheaderlistitem.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbkeyscollection.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbkeyselector.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/commonkeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/metadatakeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/positionkeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at eoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d ir ectorynameoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/f il epropertiesoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/m et adataoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/s eq 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/mod > >> >> > ifi er s/fillmodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod > >> >> > ifi er s/replacemodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod > >> >> > ifi er s/rangemodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt > >> >> > ion s/ dateoptiondialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt > >> >> > ion s/ sequencenumberoptiondialogwidget.ui > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/pri > >> >> > nto pt 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 > >> >> > [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 > >> > >> _______________________________________________ > >> 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 Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
yes agree.
patch cmake files. I will test if all is fine under windows and mac Gilles 2010/11/8 Andi Clemens <[hidden email]>: > I'd also like to use one big INCLUDE_DIRECTORIES in the main CMakeLists.txt > file. > This way we don't have to add the include dirs over and over again in all the > subprojects like it is now. > If something changes in the source tree, we need to change at least 12 > CMakeLists.txt files, having one section in the main file will prevent this. > No need to redefine this over and over again. > > Andi Clemens > ----------------- > www.digikam.org > > On Monday 08 November 2010 12:57:54 Gilles Caulier wrote: >> 2010/11/8 Andi Clemens <[hidden email]>: >> > those libs will not be installed at all, they are just used for compiling >> > the digiKam, test suite and digiKamthemedesigner targets. >> > But it will prevent recompiling the object files over and over again. >> >> Ah fine. I remember a similar way used with KDE3/Qt3 version before >> Cmake port. Fine for me. >> >> Another tool which need this way is dng converter for example >> >> > For example try compiling the themedesigner: >> > it will compile the queuemanager again, all dimg filter, advanced rename, >> > etc... and I don't even know why there are such weird dependencies at >> > all, why does the themedesigner need BQM? >> >> I remember some broken compilation without. But it's can be different now. >> >> > By putting all the little subprobjects into static libs, we can avoid >> > recompilation. Again, these static libs are used only for building, not >> > for later usage at runtime. So there are no changes for packagers at >> > all. >> >> Lets go well... >> >> Gilles Caulier >> >> > Andi Clemens >> > ----------------- >> > www.digikam.org >> > >> > On Monday 08 November 2010 12:39:56 Gilles Caulier wrote: >> >> This want mean that more static libs files will be installed on the >> >> system, as libdigikam.so ? >> >> >> >> Other project work like this, as Amarok ? >> >> >> >> Perhaps packagers can comment this. >> >> >> >> What's about static lib revision ID ? >> >> >> >> Gilles >> >> >> >> 2010/11/8 Andi Clemens <[hidden email]>: >> >> > 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 <[hidden email]>: >> >> >> > 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: [hidden email] >> >> >> > >> >> >> > 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/advancedrenam >> >> >> > edi al og.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam >> >> >> > ein pu t.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam >> >> >> > ema na ger.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam >> >> >> > ewi dg et.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynami >> >> >> > cla yo ut.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highli >> >> >> > ght er .cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifi >> >> >> > er. cp p - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option >> >> >> > .cp p - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea >> >> >> > ble .c pp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea >> >> >> > ble di alog.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser >> >> >> > .cp p - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser >> >> >> > esu lt s.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/rename >> >> >> > thr ea d.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token. >> >> >> > cpp - >> >> >> > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti >> >> >> > pcr ea tor.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti >> >> >> > pdi al og.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaul >> >> >> > tre na meparser.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/import >> >> >> > ren am eparser.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /c asemodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /d efaultvaluemodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /r angemodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /r emovedoublesmodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /r eplacemodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /t rimmedmodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi >> >> >> > ers /u niquemodifier.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/c am eranameoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/databaseoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/dbheaderlistitem.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/dbkeyscollection.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/dbkeyselector.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/keys/commonkeys.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/keys/metadatakeys.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at abase/keys/positionkeys.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d at eoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/d ir ectorynameoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/f il epropertiesoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/m et adataoption.cpp - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option >> >> >> > s/s eq 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/mod >> >> >> > ifi er s/fillmodifierdialogwidget.ui - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod >> >> >> > ifi er s/replacemodifierdialogwidget.ui - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod >> >> >> > ifi er s/rangemodifierdialogwidget.ui - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt >> >> >> > ion s/ dateoptiondialogwidget.ui - >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt >> >> >> > ion s/ sequencenumberoptiondialogwidget.ui >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/pri >> >> >> > nto pt 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 >> >> >> > [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 >> >> >> >> _______________________________________________ >> >> 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 > _______________________________________________ > 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: extragear/graphics/digikam
|
|
ok... this will take a while :D
I will send you a patch instead of committing it. Andi Clemens ----------------- www.digikam.org On Monday 08 November 2010 13:13:49 Gilles Caulier wrote: > yes agree. > > patch cmake files. I will test if all is fine under windows and mac > > Gilles > > 2010/11/8 Andi Clemens <[hidden email]>: > > I'd also like to use one big INCLUDE_DIRECTORIES in the main > > CMakeLists.txt file. > > This way we don't have to add the include dirs over and over again in all > > the subprojects like it is now. > > If something changes in the source tree, we need to change at least 12 > > CMakeLists.txt files, having one section in the main file will prevent > > this. No need to redefine this over and over again. > > > > Andi Clemens > > ----------------- > > www.digikam.org > > > > On Monday 08 November 2010 12:57:54 Gilles Caulier wrote: > >> 2010/11/8 Andi Clemens <[hidden email]>: > >> > those libs will not be installed at all, they are just used for > >> > compiling the digiKam, test suite and digiKamthemedesigner targets. > >> > But it will prevent recompiling the object files over and over again. > >> > >> Ah fine. I remember a similar way used with KDE3/Qt3 version before > >> Cmake port. Fine for me. > >> > >> Another tool which need this way is dng converter for example > >> > >> > For example try compiling the themedesigner: > >> > it will compile the queuemanager again, all dimg filter, advanced > >> > rename, etc... and I don't even know why there are such weird > >> > dependencies at all, why does the themedesigner need BQM? > >> > >> I remember some broken compilation without. But it's can be different > >> now. > >> > >> > By putting all the little subprobjects into static libs, we can avoid > >> > recompilation. Again, these static libs are used only for building, > >> > not for later usage at runtime. So there are no changes for packagers > >> > at all. > >> > >> Lets go well... > >> > >> Gilles Caulier > >> > >> > Andi Clemens > >> > ----------------- > >> > www.digikam.org > >> > > >> > On Monday 08 November 2010 12:39:56 Gilles Caulier wrote: > >> >> This want mean that more static libs files will be installed on the > >> >> system, as libdigikam.so ? > >> >> > >> >> Other project work like this, as Amarok ? > >> >> > >> >> Perhaps packagers can comment this. > >> >> > >> >> What's about static lib revision ID ? > >> >> > >> >> Gilles > >> >> > >> >> 2010/11/8 Andi Clemens <[hidden email]>: > >> >> > 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/migrationdl > >> >> >> g.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 <[hidden email]>: > >> >> >> > 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: [hidden email] > >> >> >> > > >> >> >> > 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.cp > >> >> >> > p ) > >> >> >> > > >> >> >> > - SET(libadvancedrename_SRCS > >> >> >> > - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedre > >> >> >> > nam edi al og.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedre > >> >> >> > nam ein pu t.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedre > >> >> >> > nam ema na ger.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedre > >> >> >> > nam ewi dg et.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dyn > >> >> >> > ami cla yo ut.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/hig > >> >> >> > hli ght er .cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/mod > >> >> >> > ifi er. cp p - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/opt > >> >> >> > ion .cp p - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/par > >> >> >> > sea ble .c pp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/par > >> >> >> > sea ble di alog.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/par > >> >> >> > ser .cp p - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/par > >> >> >> > ser esu lt s.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/ren > >> >> >> > ame thr ea d.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tok > >> >> >> > en. cpp - > >> >> >> > > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/too > >> >> >> > lti pcr ea tor.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/too > >> >> >> > lti pdi al og.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/def > >> >> >> > aul tre na meparser.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/imp > >> >> >> > ort ren am eparser.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /c asemodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /d efaultvaluemodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /r angemodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /r emovedoublesmodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /r eplacemodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /t rimmedmodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/mod > >> >> >> > ifi ers /u niquemodifier.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/c am eranameoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/databaseoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/dbheaderlistitem.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/dbkeyscollection.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/dbkeyselector.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/keys/commonkeys.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/keys/metadatakeys.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at abase/keys/positionkeys.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d at eoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/d ir ectorynameoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/f il epropertiesoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/m et adataoption.cpp - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/opt > >> >> >> > ion s/s eq 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/ > >> >> >> > mod ifi er s/fillmodifierdialogwidget.ui - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/ > >> >> >> > mod ifi er s/replacemodifierdialogwidget.ui - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/ > >> >> >> > mod ifi er s/rangemodifierdialogwidget.ui - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/ > >> >> >> > opt ion s/ dateoptiondialogwidget.ui - > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/ > >> >> >> > opt ion s/ sequencenumberoptiondialogwidget.ui > >> >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/ > >> >> >> > pri nto pt 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 > >> >> >> > [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 > >> >> > >> >> _______________________________________________ > >> >> 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 > > > > _______________________________________________ > > 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: extragear/graphics/digikam
|
|
In reply to this post by Bugzilla from andi.clemens@gmx.net
I doesn't work better:
[ 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 2010/11/8 Andi Clemens <[hidden email]>: > 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 <[hidden email]>: >> > 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: [hidden email] >> > >> > 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 >> > [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 > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
What happens if you just build advancedrename?
make advancedrename Does it build a static lib? Andi Clemens ----------------- www.digikam.org On Monday 08 November 2010 13:22:55 Gilles Caulier wrote: > I doesn't work better: > > [ 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 > > 2010/11/8 Andi Clemens <[hidden email]>: > > 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 <[hidden email]>: > >> > 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: [hidden email] > >> > > >> > 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/advancedrenamedi > >> > al og.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamein > >> > pu t.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamema > >> > na ger.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewi > >> > dg et.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamicla > >> > yo ut.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlight > >> > er .cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier. > >> > cp p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cp > >> > p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable > >> > .c pp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable > >> > di alog.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cp > >> > p - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresu > >> > lt s.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethr > >> > ea d.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp > >> > - > >> > > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcr > >> > ea tor.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdi > >> > al og.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultre > >> > na meparser.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importren > >> > am 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/c > >> > am eranameoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/databaseoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbheaderlistitem.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbkeyscollection.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/dbkeyselector.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/commonkeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/metadatakeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at abase/keys/positionkeys.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > at eoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d > >> > ir ectorynameoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/f > >> > il epropertiesoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/m > >> > et adataoption.cpp - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/s > >> > eq 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/modifi > >> > er s/fillmodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi > >> > er s/replacemodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi > >> > er s/rangemodifierdialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option > >> > s/ dateoptiondialogwidget.ui - > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option > >> > s/ sequencenumberoptiondialogwidget.ui > >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printo > >> > pt 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 > >> > [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 > > _______________________________________________ > 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: extragear/graphics/digikam
|
|
well, no :
[gilles@localhost digikam]$ pwd /mnt/data/Devel/SVN/trunk/graphics/digikam [gilles@localhost digikam]$ svn up At revision 1194244. [gilles@localhost digikam]$ make advancedrename make: *** No rule to make target `advancedrename'. Stop. [gilles@localhost digikam]$ ls AUTHORS config-digikam.h data/ Doxyfile.cmake Mainpage.dox showfoto/ TODO.MYSQLPORT ChangeLog config-digikam.h.cmake databaseserver/ HACKING Makefile svnscript.cmake utilities/ cmake/ COPYING DESIGN imageplugins/ Messages.sh* tests/ CMakeFiles/ COPYING.DOC digikam/ INSTALL NEWS themedesigner/ cmake_install.cmake COPYING.LIB digikam.lsm kioslave/ project/ tips CMakeLists.txt CTestTestfile.cmake digikam.lsm.cmake libs/ README TODO [gilles@localhost digikam]$ Gilles 2010/11/8 Andi Clemens <[hidden email]>: > What happens if you just build advancedrename? > > make advancedrename > > Does it build a static lib? > > Andi Clemens > ----------------- > www.digikam.org > > On Monday 08 November 2010 13:22:55 Gilles Caulier wrote: >> I doesn't work better: >> >> [ 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 >> >> 2010/11/8 Andi Clemens <[hidden email]>: >> > 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 <[hidden email]>: >> >> > 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: [hidden email] >> >> > >> >> > 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/advancedrenamedi >> >> > al og.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamein >> >> > pu t.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamema >> >> > na ger.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenamewi >> >> > dg et.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynamicla >> >> > yo ut.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highlight >> >> > er .cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifier. >> >> > cp p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option.cp >> >> > p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable >> >> > .c pp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseable >> >> > di alog.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser.cp >> >> > p - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parseresu >> >> > lt s.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/renamethr >> >> > ea d.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token.cpp >> >> > - >> >> > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipcr >> >> > ea tor.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/tooltipdi >> >> > al og.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaultre >> >> > na meparser.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/importren >> >> > am 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/c >> >> > am eranameoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/databaseoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbheaderlistitem.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbkeyscollection.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/dbkeyselector.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/commonkeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/metadatakeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at abase/keys/positionkeys.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > at eoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/d >> >> > ir ectorynameoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/f >> >> > il epropertiesoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/m >> >> > et adataoption.cpp - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/options/s >> >> > eq 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/modifi >> >> > er s/fillmodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi >> >> > er s/replacemodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/modifi >> >> > er s/rangemodifierdialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option >> >> > s/ dateoptiondialogwidget.ui - >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/option >> >> > s/ sequencenumberoptiondialogwidget.ui >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/printo >> >> > pt 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 >> >> > [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 >> >> _______________________________________________ >> 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: extragear/graphics/digikam
|
|
Something is wrong with your build dir.
Do you use a separate build dir or an insource build? For an out-of-source build, simply delete the build folder and recreate it. For an in-source build: make sure you committed everything (or saved changes in a patch), then delete all files and folders with rm -rf * This should keep the hidden folders and files, e.g. ".svn" etc. Calling "svn up" will recreate your sources and you can start compiling. It should definetly have an advancedrename target now, I just removed everything here and created a fresh checkout, it is working fine. Andi Clemens ----------------- www.digikam.org On Monday 08 November 2010 13:41:33 Gilles Caulier wrote: > well, no : > > [gilles@localhost digikam]$ pwd > /mnt/data/Devel/SVN/trunk/graphics/digikam > [gilles@localhost digikam]$ svn up > At revision 1194244. > [gilles@localhost digikam]$ make advancedrename > make: *** No rule to make target `advancedrename'. Stop. > [gilles@localhost digikam]$ ls > AUTHORS config-digikam.h data/ > Doxyfile.cmake Mainpage.dox showfoto/ TODO.MYSQLPORT > ChangeLog config-digikam.h.cmake databaseserver/ > HACKING Makefile svnscript.cmake utilities/ > cmake/ COPYING DESIGN > imageplugins/ Messages.sh* tests/ > CMakeFiles/ COPYING.DOC digikam/ > INSTALL NEWS themedesigner/ > cmake_install.cmake COPYING.LIB digikam.lsm > kioslave/ project/ tips > CMakeLists.txt CTestTestfile.cmake digikam.lsm.cmake libs/ > README TODO > [gilles@localhost digikam]$ > > Gilles > > 2010/11/8 Andi Clemens <[hidden email]>: > > What happens if you just build advancedrename? > > > > make advancedrename > > > > Does it build a static lib? > > > > Andi Clemens > > ----------------- > > www.digikam.org > > > > On Monday 08 November 2010 13:22:55 Gilles Caulier wrote: > >> I doesn't work better: > >> > >> [ 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 > >> > >> 2010/11/8 Andi Clemens <[hidden email]>: > >> > 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 <[hidden email]>: > >> >> > 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: [hidden email] > >> >> > > >> >> > 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/advancedrenam > >> >> > edi al og.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ein pu t.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ema na ger.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/advancedrenam > >> >> > ewi dg et.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/dynami > >> >> > cla yo ut.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/highli > >> >> > ght er .cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/modifi > >> >> > er. cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/option > >> >> > .cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea > >> >> > ble .c pp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parsea > >> >> > ble di alog.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser > >> >> > .cp p - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/parser > >> >> > esu lt s.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/rename > >> >> > thr ea d.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/token. > >> >> > cpp - > >> >> > > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti > >> >> > pcr ea tor.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/common/toolti > >> >> > pdi al og.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/defaul > >> >> > tre na meparser.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/import > >> >> > ren am eparser.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /c asemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /d efaultvaluemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r angemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r emovedoublesmodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /r eplacemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /t rimmedmodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/modifi > >> >> > ers /u niquemodifier.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/c am eranameoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/databaseoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbheaderlistitem.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbkeyscollection.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/dbkeyselector.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/commonkeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/metadatakeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at abase/keys/positionkeys.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d at eoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/d ir ectorynameoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/f il epropertiesoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/m et adataoption.cpp - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/parser/option > >> >> > s/s eq 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/mod > >> >> > ifi er s/fillmodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod > >> >> > ifi er s/replacemodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/mod > >> >> > ifi er s/rangemodifierdialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt > >> >> > ion s/ dateoptiondialogwidget.ui - > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/advancedrename/parser/opt > >> >> > ion s/ sequencenumberoptiondialogwidget.ui > >> >> > ${CMAKE_CURRENT_SOURCE_DIR}/../utilities/imageeditor/printiface/pri > >> >> > nto pt 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 > >> >> > [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 > >> > >> _______________________________________________ > >> 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 Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
2010/11/8 Andi Clemens <[hidden email]>:
> Something is wrong with your build dir. > Do you use a separate build dir or an insource build? insource. > > For an out-of-source build, simply delete the build folder and recreate it. > > For an in-source build: make sure you committed everything (or saved changes > in a patch), then delete all files and folders with rm -rf * > This should keep the hidden folders and files, e.g. ".svn" etc. > Calling "svn up" will recreate your sources and you can start compiling. Hum already done. I will try again Gilles _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
yes, now it compile and link fine...
Gilles 2010/11/8 Gilles Caulier <[hidden email]>: > 2010/11/8 Andi Clemens <[hidden email]>: >> Something is wrong with your build dir. >> Do you use a separate build dir or an insource build? > > insource. > >> >> For an out-of-source build, simply delete the build folder and recreate it. >> >> For an in-source build: make sure you committed everything (or saved changes >> in a patch), then delete all files and folders with rm -rf * >> This should keep the hidden folders and files, e.g. ".svn" etc. >> Calling "svn up" will recreate your sources and you can start compiling. > > Hum already done. I will try again > > Gilles > Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Re: extragear/graphics/digikam
|
|
In reply to this post by Bugzilla from andi.clemens@gmx.net
Does not compile anymore...
Andi On Saturday 13 November 2010 16:14:53 Gilles Caulier wrote: > SVN commit 1196491 by cgilles: > > use integer value to set radius of blur filter. Integer is nore universal > to be shared between gaussian and CImg blur algorithm Marcel, this need a > little adjust in GoSC2010 branche > > > M +5 -5 imageplugins/enhance/blurtool.cpp > M +26 -15 libs/dimg/filters/fx/blurfilter.cpp > M +3 -3 libs/dimg/filters/fx/blurfilter.h > M +8 -8 utilities/queuemanager/basetools/enhance/blur.cpp > M +1 -1 utilities/queuemanager/basetools/enhance/blur.h > > > --- trunk/extragear/graphics/digikam/imageplugins/enhance/blurtool.cpp > #1196490:1196491 @@ -72,7 +72,7 @@ > const QString configGroupName; > const QString configRadiusAdjustmentEntry; > > - RDoubleNumInput* radiusInput; > + RIntNumInput* radiusInput; > ImageRegionWidget* previewWidget; > EditorToolSettings* gboxSettings; > }; > @@ -92,9 +92,9 @@ > // -------------------------------------------------------- > > QLabel* label = new QLabel(i18n("Smoothness:")); > - d->radiusInput = new RDoubleNumInput(); > - d->radiusInput->setRange(0.0, 120.0, 0.1); > - d->radiusInput->setDefaultValue(0.0); > + d->radiusInput = new RIntNumInput(); > + d->radiusInput->setRange(0, 100, 1); > + d->radiusInput->setDefaultValue(0); > d->radiusInput->setWhatsThis(i18n("A smoothness of 0 has no effect, " > "1 and above determine the Gaussian > blur matrix radius " "that determines how much to blur the image.")); @@ > -118,7 +118,7 @@ > > // -------------------------------------------------------- > > - connect(d->radiusInput, SIGNAL(valueChanged(double)), > + connect(d->radiusInput, SIGNAL(valueChanged(int)), > this, SLOT(slotTimer())); > > connect(d->previewWidget, SIGNAL(signalOriginalClipFocusChanged()), > --- trunk/extragear/graphics/digikam/libs/dimg/filters/fx/blurfilter.cpp > #1196490:1196491 @@ -42,7 +42,7 @@ > namespace Digikam > { > > -BlurFilter::BlurFilter(DImg* orgImage, QObject* parent, double radius) > +BlurFilter::BlurFilter(DImg* orgImage, QObject* parent, int radius) > > : DImgThreadedFilter(orgImage, parent, "GaussianBlur") > > { > m_radius = radius; > @@ -51,7 +51,7 @@ > > BlurFilter::BlurFilter(DImgThreadedFilter* parentFilter, > const DImg& orgImage, const DImg& destImage, > - int progressBegin, int progressEnd, double radius) > + int progressBegin, int progressEnd, int radius) > > : DImgThreadedFilter(parentFilter, orgImage, destImage, > : progressBegin, progressEnd, > > parentFilter->filterName() + ": > GaussianBlur") { > @@ -68,10 +68,10 @@ > { > #if defined(__MACOSX__) || defined(__APPLE__) > gaussianBlurImage(m_orgImage.bits(), m_orgImage.width(), > m_orgImage.height(), - m_orgImage.sixteenBit(), > lround(m_radius*10.0)); + m_orgImage.sixteenBit(), > m_radius); > #else > cimgBlurImage(m_orgImage.bits(), m_orgImage.width(), > m_orgImage.height(), - m_orgImage.sixteenBit(), > m_radius); > + m_orgImage.sixteenBit(), m_radius/10;0); > #endif > } > > @@ -87,9 +87,12 @@ > if (radius <= 0.0) > { > m_destImage = m_orgImage; > + postProgress(100); > return; > } > > + kDebug() << "Radius: " << radius; > + > kDebug() << "BlurFilter::Process Computation..."; > > if (!sixteenBit) // 8 bits image. > @@ -97,9 +100,11 @@ > // convert DImg (interleaved RGBA) to CImg (planar RGBA) > CImg<uchar> img = CImg<uchar>(data, 4, width, height, 1, true). > get_permute_axes("yzvx"); > + postProgress(25); > > // blur the image > img.blur(radius); > + postProgress(50); > > // Copy CImg onto destination. > kDebug() << "BlurFilter::Finalization..."; > @@ -117,15 +122,18 @@ > ptr += 4; > } > } > + postProgress(75); > } > else // 16 bits image. > { > // convert DImg (interleaved RGBA) to CImg (planar RGBA) > CImg<unsigned short> img = CImg<unsigned short>((unsigned > short*)data, 4, width, height, 1, true). get_permute_axes("yzvx"); > + postProgress(25); > > // blur the image > img.blur(radius); > + postProgress(50); > > // Copy CImg onto destination. > kDebug() << "BlurFilter::Finalization..."; > @@ -143,7 +151,10 @@ > ptr += 4; > } > } > + postProgress(75); > } > + > + postProgress(100); > } > > void BlurFilter::gaussianBlurImage(uchar* data, int width, int height, > bool sixteenBit, int radius) @@ -178,7 +189,7 @@ > factor = exp (lnfactor); > sd = exp (lnsd); > > - for (i = 0; !runningFlag() && (i < nKSize); ++i) > + for (i = 0; runningFlag() && (i < nKSize); ++i) > { > x = sqrt ((i - nCenter) * (i - nCenter)); > Kernel[i] = (int)(factor * exp (-0.5 * pow ((x / sd), 2)) / (sd * > sqrt (2.0 * M_PI))); @@ -197,8 +208,8 @@ > > int** arrMult = Alloc2DArray (nKernelWidth, sixteenBit ? 65536 : 256); > > - for (i = 0; !runningFlag() && (i < nKernelWidth); ++i) > - for (j = 0; !runningFlag() && (j < (sixteenBit ? 65536 : 256)); > ++j) + for (i = 0; runningFlag() && (i < nKernelWidth); ++i) > + for (j = 0; runningFlag() && (j < (sixteenBit ? 65536 : 256)); > ++j) arrMult[i][j] = j * Kernel[i]; > > // We need to copy our bits to blur bits > @@ -217,9 +228,9 @@ > > // Now, we enter in the main loop > > - for (h = 0; !runningFlag() && (h < height); ++h) > + for (h = 0; runningFlag() && (h < height); ++h) > { > - for (w = 0; !runningFlag() && (w < width); ++w, i+=4) > + for (w = 0; runningFlag() && (w < width); ++w, i+=4) > { > if (!sixteenBit) // 8 bits image. > { > @@ -227,7 +238,7 @@ > > // first of all, we need to blur the horizontal lines > > - for (n = -radius; !runningFlag() && (n <= radius); ++n) > + for (n = -radius; runningFlag() && (n <= radius); ++n) > { > // if is inside... > if (IsInside (width, height, w + n, h)) > @@ -266,7 +277,7 @@ > > // first of all, we need to blur the horizontal lines > > - for (n = -radius; !runningFlag() && (n <= radius); ++n) > + for (n = -radius; runningFlag() && (n <= radius); ++n) > { > // if is inside... > if (IsInside (width, height, w + n, h)) > @@ -310,16 +321,16 @@ > i = j = 0; > > // We enter in the second main loop > - for (w = 0; !runningFlag() && (w < width); ++w, i = w*4) > + for (w = 0; runningFlag() && (w < width); ++w, i = w*4) > { > - for (h = 0; !runningFlag() && (h < height); ++h, i += width*4) > + for (h = 0; runningFlag() && (h < height); ++h, i += width*4) > { > if (!sixteenBit) // 8 bits image. > { > uchar *org, *dst; > > // first of all, we need to blur the vertical lines > - for (n = -radius; !runningFlag() && (n <= radius); ++n) > + for (n = -radius; runningFlag() && (n <= radius); ++n) > { > // if is inside... > if (IsInside(width, height, w, h + n)) > @@ -359,7 +370,7 @@ > unsigned short *org, *dst; > > // first of all, we need to blur the vertical lines > - for (n = -radius; !runningFlag() && (n <= radius); ++n) > + for (n = -radius; runningFlag() && (n <= radius); ++n) > { > // if is inside... > if (IsInside(width, height, w, h + n)) > --- trunk/extragear/graphics/digikam/libs/dimg/filters/fx/blurfilter.h > #1196490:1196491 @@ -39,11 +39,11 @@ > > public: > > - explicit BlurFilter(DImg* orgImage, QObject* parent=0, double > radius=3.0); + explicit BlurFilter(DImg* orgImage, QObject* parent=0, > int radius=3); > > // Constructor for slave mode: execute immediately in current thread > with specified master filter explicit BlurFilter(DImgThreadedFilter* > parentFilter, const DImg& orgImage, const DImg& destImage, - > int progressBegin=0, int progressEnd=100, double radius=3.0); + > int progressBegin=0, int progressEnd=100, int > radius=3); > > ~BlurFilter(); > > @@ -88,7 +88,7 @@ > > private: > > - double m_radius; > + int m_radius; > }; > > } // namespace Digikam > --- > trunk/extragear/graphics/digikam/utilities/queuemanager/basetools/enhance/ > blur.cpp #1196490:1196491 @@ -52,9 +52,9 @@ > > QWidget* box = new QWidget; > QLabel* label = new QLabel(i18n("Smoothness:")); > - m_radiusInput = new RDoubleNumInput(); > - m_radiusInput->setRange(0.0, 120.0, 0.1); > - m_radiusInput->setDefaultValue(0.0); > + m_radiusInput = new RIntNumInput(); > + m_radiusInput->setRange(0, 100, 1); > + m_radiusInput->setDefaultValue(0); > m_radiusInput->setWhatsThis(i18n("A smoothness of 0 has no effect, " > "1 and above determine the Gaussian > blur matrix radius " "that determines how much to blur the image.")); @@ > -68,7 +68,7 @@ > > setSettingsWidget(box); > > - connect(m_radiusInput, SIGNAL(valueChanged(double)), > + connect(m_radiusInput, SIGNAL(valueChanged(int)), > this, SLOT(slotSettingsChanged())); > } > > @@ -80,21 +80,21 @@ > { > BatchToolSettings settings; > > - settings.insert("Radius", (double)m_radiusInput->defaultValue()); > + settings.insert("Radius", (int)m_radiusInput->defaultValue()); > > return settings; > } > > void Blur::slotAssignSettings2Widget() > { > - m_radiusInput->setValue(settings()["Radius"].toDouble()); > + m_radiusInput->setValue(settings()["Radius"].toInt()); > } > > void Blur::slotSettingsChanged() > { > BatchToolSettings settings; > > - settings.insert("Radius", (double)m_radiusInput->value()); > + settings.insert("Radius", (int)m_radiusInput->value()); > > BatchTool::slotSettingsChanged(settings); > } > @@ -104,7 +104,7 @@ > if (!loadToDImg()) > return false; > > - double radius = settings()["Radius"].toDouble(); > + double radius = settings()["Radius"].toInt(); > > BlurFilter blur(&image(), 0L, radius); > blur.startFilterDirectly(); > --- > trunk/extragear/graphics/digikam/utilities/queuemanager/basetools/enhance/ > blur.h #1196490:1196491 @@ -57,7 +57,7 @@ > > private: > > - RDoubleNumInput* m_radiusInput; > + RIntNumInput* m_radiusInput; > }; > > } // namespace Digikam 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 |