[Kde-imaging] trunk

[Pino Toscano]

SVN commit 816112 by pino:

As agreed with Gilles Caulier and Aurélien Gâteau, move the kipi library to kdegraphics for KDE 4.1.
This breaks a nice dependancy cycle, and ease a bit its usage.

CCMAIL: kde-imaging at kde.org


 M  +1 -0      KDE/kdegraphics/CMakeLists.txt  
 A             KDE/kdegraphics/libs (directory)  
 A             KDE/kdegraphics/libs/CMakeLists.txt  
 A             KDE/kdegraphics/libs/libkipi (directory)   extragear/libs/libkipi#816107
 M  +0 -1      KDE/kdegraphics/libs/libkipi/CMakeLists.txt  
 M  +0 -1      extragear/libs/CMakeLists.txt  
 D             extragear/libs/libkipi (directory)  


--- trunk/KDE/kdegraphics/CMakeLists.txt #816111:816112
@@ -40,6 +40,7 @@
 
 
 add_subdirectory(cmake)
+macro_optional_add_subdirectory(libs)
 macro_optional_add_subdirectory(doc)
 macro_optional_add_subdirectory(strigi-analyzer)
 macro_optional_add_subdirectory(kcolorchooser)
--- trunk/KDE/kdegraphics/libs/libkipi/CMakeLists.txt #816107:816112
@@ -46,7 +46,6 @@
 # =======================================================
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-FIND_PACKAGE(Kdcraw REQUIRED)
 
 SUBDIRS(pics)
 SUBDIRS(libkipi)
--- trunk/extragear/libs/CMakeLists.txt #816111:816112
@@ -11,7 +11,6 @@
 
 MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkexiv2)
 MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkdcraw)
-MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkipi)
 MACRO_OPTIONAL_ADD_SUBDIRECTORY(kipi-plugins)
 
 macro_display_feature_log()