[Digikam-devel] extragear/graphics/digikam

[Andi Clemens]

SVN commit 981351 by aclemens:

Add cmake option DIGIKAM_THUMBS_DB
This is just a temporary solution, we will not need it in the future.
But for now it becomes quickly annoying to set and revert the database
code when you want to test the thumbs db and the freedesktop solution.

To enable the thumbs db, add

-DDIGIKAM_THUMBS_DB=yes

to your cmake configuration.

Andi

CCMAIL:digikam-devel at kde.org

 M  +2 -0      CMakeLists.txt  
 M  +3 -0      config-digikam.h.cmake  
 M  +5 -2      digikam/albummanager.cpp  


--- trunk/extragear/graphics/digikam/CMakeLists.txt #981350:981351
@@ -102,6 +102,8 @@
 MACRO_OPTIONAL_FIND_PACKAGE(Lqr-1)
 MACRO_BOOL_TO_01(LQR-1_FOUND USE_EXT_LIBLQR-1)
 
+MACRO_BOOL_TO_01(DIGIKAM_THUMBS_DB USE_THUMBS_DB)
+
 # Set config file depending of optional depencies
 
 CONFIGURE_FILE(config-digikam.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-digikam.h)
--- trunk/extragear/graphics/digikam/config-digikam.h.cmake #981350:981351
@@ -16,4 +16,7 @@
 /* Define to 1 if an external liblqr-1 shared library have been found */
 #cmakedefine USE_EXT_LIBLQR-1 1
 
+/* Define to 1 if you want to use the experimental thumbnails database */
+#cmakedefine USE_THUMBS_DB 1
+
 #endif /* CONFIG_DIGIKAM_H */
--- trunk/extragear/graphics/digikam/digikam/albummanager.cpp #981350:981351
@@ -87,6 +87,7 @@
 #include "setup.h"
 #include "thumbnailloadthread.h"
 #include "upgradedb_sqlite2tosqlite3.h"
+#include "config-digikam.h"
 
 namespace Digikam
 {
@@ -681,11 +682,13 @@
         }
     }
 
+#ifdef USE_THUMBS_DB
     // Initialize thumbnail database
-/*    QFileInfo thumbFile(d->dbPath, "thumbnails-digikam.db");
+    QFileInfo thumbFile(d->dbPath, "thumbnails-digikam.db");
     ThumbnailLoadThread::initializeThumbnailDatabase(thumbFile.filePath(), new DatabaseThumbnailInfoProvider());
     d->dirWatchBlackList << "thumbnails-digikam.db" << "thumbnails-digikam.db-journal";
-*/
+#endif
+
     return true;
 }