[Digikam-devel] extragear/libs

[Gustavo P. Boiko]

SVN commit 742971 by boiko:

Fix some include directories to make it compile.
CCMAIL: digikam-devel at kde.org


 M  +1 -0      kipi-plugins/common/libkipiplugins/CMakeLists.txt  
 M  +2 -0      kipi-plugins/jpeglossless/CMakeLists.txt  
 M  +2 -0      kipi-plugins/rawconverter/CMakeLists.txt  
 M  +1 -0      kipi-plugins/sendimages/CMakeLists.txt  
 M  +1 -1      libkdcraw/dcraw/CMakeLists.txt  
 M  +1 -1      libkexiv2/libkexiv2/CMakeLists.txt  


--- trunk/extragear/libs/kipi-plugins/common/libkipiplugins/CMakeLists.txt #742970:742971
@@ -1,4 +1,5 @@
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/pluginsversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pluginsversion.h)
+INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR})
 
 SET(kipiplugins_LIB_SRCS kpaboutdata.cpp kpwriteimage.cpp iccjpeg.c squeezedcombobox.cpp)
 
--- trunk/extragear/libs/kipi-plugins/jpeglossless/CMakeLists.txt #742970:742971
@@ -5,6 +5,8 @@
 # So make sure nofinal is always used here!
 KDE4_NO_ENABLE_FINAL(kipiplugin_jpeglossless)
 
+INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
+
 SET(kipiplugin_jpeglossless_PART_SRCS plugin_jpeglossless.cpp 
                                       transupp.cpp 
                                       jpegtransform.cpp 
--- trunk/extragear/libs/kipi-plugins/rawconverter/CMakeLists.txt #742970:742971
@@ -4,6 +4,8 @@
                 -DQT3_SUPPORT_WARNINGS
                )
 
+INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR})
+
 SET(kipiplugin_rawconverter_PART_SRCS plugin_rawconverter.cpp 
                                       previewwidget.cpp 
                                       savesettingswidget.cpp 
--- trunk/extragear/libs/kipi-plugins/sendimages/CMakeLists.txt #742970:742971
@@ -1,3 +1,4 @@
+INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_PNG_INCLUDE_DIR})
 SET(kipiplugin_sendimages_PART_SRCS plugin_sendimages.cpp 
                                     sendimagesdialog.cpp 
                                     imagespage.cpp
--- trunk/extragear/libs/libkdcraw/dcraw/CMakeLists.txt #742970:742971
@@ -10,8 +10,8 @@
 
 # Require by dcraw.c implementation.
 KDE4_NO_ENABLE_FINAL(kdcraw)
+INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${LCMS_INCLUDE_DIR})
 
-
 # This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
 # In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C 
 # implementation. The -Dinline option please compiler to see inline with this option.
--- trunk/extragear/libs/libkexiv2/libkexiv2/CMakeLists.txt #742970:742971
@@ -1,6 +1,6 @@
 ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
 
-INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${QT4_INCLUDES})
+INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${QT4_INCLUDES} ${EXIV2_INCLUDE_DIR})
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h)