[poppler] 7 commits - cmake/modules config.h.cmake ConfigureChecks.cmake

Pino Toscano pino at kemper.freedesktop.org
Sun Dec 13 15:58:19 PST 2009


 ConfigureChecks.cmake         |    4 ++++
 cmake/modules/FindCairo.cmake |   18 ++++++++++++++++++
 config.h.cmake                |   36 +++++++++++++++++++++++++++++-------
 3 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit b3f5e5d60bc9109da961940f6216722f9db4a87b
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:56:15 2009 +0100

    [CMake] add the configure check for the Cairo blend modes support (as in autotools)

diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake
index a0a8400..ccf8208 100644
--- a/cmake/modules/FindCairo.cmake
+++ b/cmake/modules/FindCairo.cmake
@@ -37,6 +37,24 @@ if (NOT WIN32)
 
 endif(NOT WIN32)
 
+if (CAIRO_FOUND)
+  include(MacroPushRequiredVars)
+  include(CheckCSourceCompiles)
+
+  macro_push_required_vars()
+  set(CMAKE_REQUIRED_DEFINITIONS ${CAIRO_CFLAGS})
+  set(CMAKE_REQUIRED_LIBRARIES ${CAIRO_LIBRARIES})
+  check_c_source_compiles("
+#include <cairo.h>
+int main() {
+  cairo_t *cr;
+  cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
+  return 0;
+}
+" CAIRO_HAS_BLEND_MODES)
+  macro_pop_required_vars()
+endif (CAIRO_FOUND)
+
 mark_as_advanced(
   CAIRO_CFLAGS
   CAIRO_LIBRARIES
diff --git a/config.h.cmake b/config.h.cmake
index 60547ea..7145e6a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,5 +1,8 @@
 /* config.h.  Generated from config.h.cmake by cmake.  */
 
+/* Whether cairo has blend modes support */
+#cmakedefine CAIRO_HAS_BLEND_MODES 1
+
 /* Use libjpeg instead of builtin jpeg decoder. */
 #cmakedefine ENABLE_LIBJPEG 1
 
commit f6ba877e0c22538cfe34d32d69814f660de59d2c
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:44:55 2009 +0100

    [CMake] add configure check for sys/mman.h (as in autotools)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 04c87af..6049c9a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -19,6 +19,7 @@ check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(stdlib.h HAVE_STDLIB_H)
 check_include_files(strings.h HAVE_STRINGS_H)
 check_include_files(string.h HAVE_STRING_H)
+check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
 check_include_files(sys/stat.h HAVE_SYS_STAT_H)
 check_include_files(sys/types.h HAVE_SYS_TYPES_H)
 check_include_files(unistd.h HAVE_UNISTD_H)
diff --git a/config.h.cmake b/config.h.cmake
index dfd4c69..60547ea 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -85,6 +85,9 @@
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */
 #cmakedefine HAVE_SYS_DIR_H 1
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#cmakedefine HAVE_SYS_MMAN_H 1
+
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
 #cmakedefine HAVE_SYS_NDIR_H 1
 
commit e12801320ae030628fc62c073983c06b39ee13d7
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:42:20 2009 +0100

    minor spello

diff --git a/config.h.cmake b/config.h.cmake
index 52f8c67..dfd4c69 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -139,7 +139,7 @@
 /* Enable word list support. */
 #cmakedefine TEXTOUT_WORD_LIST 1
 
-/* Defines if use cms. */
+/* Defines if use cms */
 #cmakedefine USE_CMS 1
 
 /* Throw exceptions to deal with not enough memory and similar problems */
commit 6428907ebcf33d4391673aadcfa71c3061f6d352
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:41:49 2009 +0100

    [CMake] add configure check for fcntl.h (as in autotools)

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 827fa15..04c87af 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -12,6 +12,7 @@ include(CheckTypeSize)
 include(CheckCSourceCompiles)
 
 check_include_files(dlfcn.h HAVE_DLFCN_H)
+check_include_files(fcntl.h HAVE_FCNTL_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
 check_include_files(memory.h HAVE_MEMORY_H)
 check_include_files(stdint.h HAVE_STDINT_H)
diff --git a/config.h.cmake b/config.h.cmake
index 6486d67..52f8c67 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -22,6 +22,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #cmakedefine HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine HAVE_FCNTL_H 1
+
 /* Have FreeType2 include files */
 #cmakedefine HAVE_FREETYPE_H 1
 
commit 916ab7163249e23bd5ba00922fdcad9caaf92c75
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:34:59 2009 +0100

    [CMake] oops, those should have been '#cmakedefine' and not '#define'

diff --git a/config.h.cmake b/config.h.cmake
index d59e367..6486d67 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -38,7 +38,7 @@
 #cmakedefine HAVE_GETTIMEOFDAY 1
 
 /* Defines if gmtime_r is available on your system */
-#define HAVE_GMTIME_R 1
+#cmakedefine HAVE_GMTIME_R 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
@@ -47,7 +47,7 @@
 #cmakedefine HAVE_LIBZ 1
 
 /* Defines if localtime_r is available on your system */
-#define HAVE_LOCALTIME_R 1
+#cmakedefine HAVE_LOCALTIME_R 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
commit ea655d8c7e24e97ee710110a783ed9c209cf76e3
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:33:51 2009 +0100

    [CMake] move and rename to match more the autotools output

diff --git a/config.h.cmake b/config.h.cmake
index 8945568..d59e367 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -3,19 +3,20 @@
 /* Use libjpeg instead of builtin jpeg decoder. */
 #cmakedefine ENABLE_LIBJPEG 1
 
-/* Use zlib instead of builtin zlib decoder. */
-#cmakedefine ENABLE_ZLIB 1
+/* Use libopenjpeg instead of builtin jpeg2000 decoder. */
+#cmakedefine ENABLE_LIBOPENJPEG 1
 
-/* Use libpng to export images in pdftohtml. */
+/* Build against libpng. */
 #cmakedefine ENABLE_LIBPNG 1
 
-/* Use liblcms for color management. */
-#cmakedefine USE_CMS 1
+/* Use zlib instead of builtin zlib decoder. */
+#cmakedefine ENABLE_ZLIB 1
 
 /* Use cairo for rendering. */
 #cmakedefine HAVE_CAIRO 1
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
 #cmakedefine HAVE_DIRENT_H 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -109,7 +110,7 @@
 #define PACKAGE "poppler"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "poppler"
@@ -120,6 +121,9 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "poppler"
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "${POPPLER_VERSION}"
 
@@ -132,6 +136,9 @@
 /* Enable word list support. */
 #cmakedefine TEXTOUT_WORD_LIST 1
 
+/* Defines if use cms. */
+#cmakedefine USE_CMS 1
+
 /* Throw exceptions to deal with not enough memory and similar problems */
 #cmakedefine USE_EXCEPTIONS 1
 
commit 9f0146c5b2f9326e834104b89791f66b18f85adc
Author: Pino Toscano <pino at kde.org>
Date:   Mon Dec 14 00:28:04 2009 +0100

    [CMake] add checks for gmtime_r and localtime_r

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 1ba656a..827fa15 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -25,7 +25,9 @@ check_include_files(unistd.h HAVE_UNISTD_H)
 check_function_exists(fseek64 HAVE_FSEEK64)
 check_function_exists(fseeko HAVE_FSEEKO)
 check_function_exists(ftell64 HAVE_FTELL64)
+check_function_exists(gmtime_r HAVE_GMTIME_R)
 check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
+check_function_exists(localtime_r HAVE_LOCALTIME_R)
 check_function_exists(popen HAVE_POPEN)
 check_function_exists(mkstemp HAVE_MKSTEMP)
 check_function_exists(mkstemps HAVE_MKSTEMPS)
diff --git a/config.h.cmake b/config.h.cmake
index 7b57de0..8945568 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -36,12 +36,18 @@
 /* Defines if gettimeofday is available on your system */
 #cmakedefine HAVE_GETTIMEOFDAY 1
 
+/* Defines if gmtime_r is available on your system */
+#define HAVE_GMTIME_R 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine HAVE_LIBZ 1
 
+/* Defines if localtime_r is available on your system */
+#define HAVE_LOCALTIME_R 1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
 


More information about the poppler mailing list