[poppler] CMakeLists.txt poppler/Makefile.am

[Albert Astals Cid]

 CMakeLists.txt      |    3 +++
 poppler/Makefile.am |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun May 17 20:00:53 2009 +0200

    Use the lcms include dir

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37ae56d..03085a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,9 @@ endif(ENABLE_ABIWORD)
 if(LIBOPENJPEG_FOUND)
   include_directories(${LIBOPENJPEG_INCLUDE_DIR})
 endif(LIBOPENJPEG_FOUND)
+if(LCMS_FOUND)
+  include_directories(${LCMS_INCLUDE_DIR})
+endif(LCMS_FOUND)
 
 if(DEFINED COMPILE_WARNINGS)
 else(DEFINED COMPILE_WARNINGS)
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index c872fda..1c63284 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -106,12 +106,14 @@ abiword_libs =					\
 endif
 
 if USE_CMS
+cms_includes = $(LCMS_CFLAGS)
 cms_libs = $(LCMS_LIBS)
 endif
 
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/goo			\
+	$(cms_includes)				\
 	$(splash_includes)			\
 	$(cairo_includes)			\
 	$(arthur_includes)			\