[Digikam-devel] extragear/graphics/digikam

[Andi Clemens]

SVN commit 1194106 by aclemens:

Create a static lib for advancedrename. This prevents recompiling of the object
files when building the test suite or the themedesigner. Right now when the
themedesigner target is build, nearly all objects from the digiKam target are
recompiled again, which is a waste of time.
We should create static libs for all the libXXX_SRCS variables in the main
CMakeLists.txt file. I also think we should remove those libXXX_SRCS variables
from there completely, they have nothing to do in there and make the code
hard to understand.

Right now I only created a static lib for advancedrename, but in the future we
should do this for all the other so called "libs", too.

CCMAIL: digikam-devel at kde.org

 M  +0 -41     CMakeLists.txt  
 M  +1 -6      digikam/CMakeLists.txt  
 M  +1 -1      tests/CMakeLists.txt  
 M  +1 -1      themedesigner/CMakeLists.txt  
 M  +1 -0      utilities/CMakeLists.txt  


--- trunk/extragear/graphics/digikam/CMakeLists.txt #1194105:1194106
@@ -1284,47 +1284,6 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/utilities/timeline/timelinewidget.cpp
        )
 
-    SET(libadvancedrename_SRCS
-        ${CMAKE_CURRENT_SOURCE_DIR}/utilities/advancedrename/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)