CMakeLists.txt | 4 - glib/CMakeLists.txt | 28 +++-------- poppler-config.h.cmake | 90 ------------------------------------ poppler/poppler-config.h.cmake | 100 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 112 deletions(-)
New commits: commit 1267d7e0c36e262984070a3b55fea46e7289a4b4 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 19:34:03 2010 +0100 [CMake] add a note about gtk-doc not supported yet diff --git a/CMakeLists.txt b/CMakeLists.txt index 21e3579..3a6e094 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -531,8 +531,8 @@ show_end_message_yesno("qt wrapper" QT3_FOUND) show_end_message_yesno("qt4 wrapper" QT4_FOUND) show_end_message_yesno("glib wrapper" ENABLE_GLIB) show_end_message_yesno(" use GDK" POPPLER_WITH_GDK) -# message(" use gtk-doc: $enable_gtk_doc") # TODO show_end_message_yesno("cpp wrapper" ENABLE_CPP) +show_end_message("use gtk-doc" "not supported with this CMake build system") show_end_message_yesno("use libjpeg" ENABLE_LIBJPEG) show_end_message_yesno("use libpng" ENABLE_LIBPNG) show_end_message_yesno("use zlib" ENABLE_ZLIB) commit 201b18ad0837e84d874b56e1b0469d1b2d45378b Author: Pino Toscano <[email protected]> Date: Sun Mar 7 19:30:36 2010 +0100 [CMake] sync with poppler-config.h.in: add WITH_FONTCONFIGURATION_{FONTCONFIG,WIN32} diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 5122a4e..7656e4f 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -39,6 +39,16 @@ #cmakedefine TEXTOUT_WORD_LIST 1 #endif +/* Use fontconfig font configuration backend */ +#ifndef WITH_FONTCONFIGURATION_FONTCONFIG +#cmakedefine WITH_FONTCONFIGURATION_FONTCONFIG 1 +#endif + +/* Use win32 font configuration backend */ +#ifndef WITH_FONTCONFIGURATION_WIN32 +#cmakedefine WITH_FONTCONFIGURATION_WIN32 1 +#endif + // Also, there's a couple of preprocessor symbols in the header files // that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and commit 0d0044e8cc2d406f066338102ec73e1b56214cc3 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 19:25:27 2010 +0100 [CMake] move poppler-config.h.cmake in the poppler subdirectory, where poppler-config.h.in is diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a2b539..21e3579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,7 +188,7 @@ endif(_comp_warnings STREQUAL "kde") include(ConfigureChecks.cmake) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -configure_file(poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h) +configure_file(poppler/poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h) set(poppler_SRCS diff --git a/poppler-config.h.cmake b/poppler-config.h.cmake deleted file mode 100644 index 5122a4e..0000000 --- a/poppler-config.h.cmake +++ /dev/null @@ -1,90 +0,0 @@ -//================================================= -*- mode: c++ -*- ==== -// -// poppler-config.h -// -// Copyright 1996-2004 Glyph & Cog, LLC -// -//======================================================================== - -#ifndef POPPLER_CONFIG_H -#define POPPLER_CONFIG_H - -// We duplicate some of the config.h #define's here since they are -// used in some of the header files we install. The #ifndef/#endif -// around #undef look odd, but it's to silence warnings about -// redefining those symbols. - -/* Enable multithreading support. */ -#ifndef MULTITHREADED -#cmakedefine MULTITHREADED 1 -#endif - -/* Enable exceptions. */ -#ifndef USE_EXCEPTIONS -#cmakedefine USE_EXCEPTIONS 1 -#endif - -/* Use fixedpoint. */ -#ifndef USE_FIXEDPOINT -#cmakedefine USE_FIXEDPOINT 1 -#endif - -/* Include support for OPI comments. */ -#ifndef OPI_SUPPORT -#cmakedefine OPI_SUPPORT 1 -#endif - -/* Enable word list support. */ -#ifndef TEXTOUT_WORD_LIST -#cmakedefine TEXTOUT_WORD_LIST 1 -#endif - -// Also, there's a couple of preprocessor symbols in the header files -// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and - -//------------------------------------------------------------------------ -// version -//------------------------------------------------------------------------ - -// copyright notice -#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"; -#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" - -//------------------------------------------------------------------------ -// popen -//------------------------------------------------------------------------ - -#if defined(_MSC_VER) || defined(__BORLANDC__) -#define popen _popen -#define pclose _pclose -#endif - -#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) -#define POPEN_READ_MODE "rb" -#else -#define POPEN_READ_MODE "r" -#endif - -//------------------------------------------------------------------------ -// Win32 stuff -//------------------------------------------------------------------------ - -#if defined(_WIN32) && !defined(_MSC_VER) -#include <windef.h> -#else -#define CDECL -#endif - -//------------------------------------------------------------------------ -// Compiler -//------------------------------------------------------------------------ - -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ - __attribute__((__format__(__printf__, fmt_index, va_index))) -#else -#define GCC_PRINTF_FORMAT(fmt_index, va_index) -#endif - - -#endif /* POPPLER_CONFIG_H */ diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake new file mode 100644 index 0000000..5122a4e --- /dev/null +++ b/poppler/poppler-config.h.cmake @@ -0,0 +1,90 @@ +//================================================= -*- mode: c++ -*- ==== +// +// poppler-config.h +// +// Copyright 1996-2004 Glyph & Cog, LLC +// +//======================================================================== + +#ifndef POPPLER_CONFIG_H +#define POPPLER_CONFIG_H + +// We duplicate some of the config.h #define's here since they are +// used in some of the header files we install. The #ifndef/#endif +// around #undef look odd, but it's to silence warnings about +// redefining those symbols. + +/* Enable multithreading support. */ +#ifndef MULTITHREADED +#cmakedefine MULTITHREADED 1 +#endif + +/* Enable exceptions. */ +#ifndef USE_EXCEPTIONS +#cmakedefine USE_EXCEPTIONS 1 +#endif + +/* Use fixedpoint. */ +#ifndef USE_FIXEDPOINT +#cmakedefine USE_FIXEDPOINT 1 +#endif + +/* Include support for OPI comments. */ +#ifndef OPI_SUPPORT +#cmakedefine OPI_SUPPORT 1 +#endif + +/* Enable word list support. */ +#ifndef TEXTOUT_WORD_LIST +#cmakedefine TEXTOUT_WORD_LIST 1 +#endif + +// Also, there's a couple of preprocessor symbols in the header files +// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and + +//------------------------------------------------------------------------ +// version +//------------------------------------------------------------------------ + +// copyright notice +#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"; +#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC" + +//------------------------------------------------------------------------ +// popen +//------------------------------------------------------------------------ + +#if defined(_MSC_VER) || defined(__BORLANDC__) +#define popen _popen +#define pclose _pclose +#endif + +#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS) +#define POPEN_READ_MODE "rb" +#else +#define POPEN_READ_MODE "r" +#endif + +//------------------------------------------------------------------------ +// Win32 stuff +//------------------------------------------------------------------------ + +#if defined(_WIN32) && !defined(_MSC_VER) +#include <windef.h> +#else +#define CDECL +#endif + +//------------------------------------------------------------------------ +// Compiler +//------------------------------------------------------------------------ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ + __attribute__((__format__(__printf__, fmt_index, va_index))) +#else +#define GCC_PRINTF_FORMAT(fmt_index, va_index) +#endif + + +#endif /* POPPLER_CONFIG_H */ commit f785e29a901d2c76204dd26e9585446fdd817ebd Author: Pino Toscano <[email protected]> Date: Sun Mar 7 18:35:34 2010 +0100 [CMake] remove the generated poppler-enums.{c,h} in the clean target ie usually when doing `make clean' diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index 1292852..bd68776 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -84,6 +84,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h DESTINATION include/poppler/glib) +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES + "${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c" +) + if (GDK_FOUND AND BUILD_GTK_TESTS) set(test_poppler_glib_SRCS commit 369604603375dbe3516136b6f8f9d0c26e0b744f Author: Pino Toscano <[email protected]> Date: Sun Mar 7 18:26:45 2010 +0100 [CMake] use the --template option of glib-mkenums (like done with autotools) diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index c789cab..1292852 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -39,38 +39,22 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h COMMAND ${GLIB2_MKENUMS} ARGS - --fhead \"\#ifndef __POPPLER_TYPE_ENUMS_H__\\n\" - --fhead \"\#define __POPPLER_TYPE_ENUMS_H__ 1\\n\\n\" - --fhead \"\#include <glib-object.h>\\n\\n\" - --fhead \"G_BEGIN_DECLS\\n\\n\" - --ftail \"G_END_DECLS\\n\\n\" - --ftail \"\#endif /* __POPPLER_TYPE_ENUMS_H__ */\\n\" - --fprod \"\\n/* --- @filename@ --- */\" - --eprod \"\#define poppler_ty...@enumshort@ \(@enum_n...@_get_type\(\)\)\\n\" - --eprod \"GType @enum_n...@_get_type \(void\) G_GNUC_CONST\;\\n\" + --template poppler-enums.h.template ${poppler_glib_public_headers} > ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${poppler_glib_public_headers} + ${CMAKE_CURRENT_SOURCE_DIR}/poppler-enums.h.template ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c COMMAND ${GLIB2_MKENUMS} ARGS - --fhead \"\#include \\"poppler-enums.h\\"\\n\\n\" - --fprod \"\\n/* enumerations from \\"@filen...@\\" */\" - --fprod \"\\n\#include \\"@filen...@\\"\" - --vhead \"static const g...@type@Value _...@enum_name@_values[] = {\" - --vprod \" { @VALUENAME@, \\"@valuen...@\\", \\"@valuen...@\\" },\" - --vtail \" { 0, NULL, NULL }\\n}\;\\n\\n\" - --vtail \"gtype...@enum_name@_get_type \(void\)\\n{\\n\" - --vtail \" static GType type = 0\;\\n\\n\" - --vtail \" if \(G_UNLIKELY \(type == 0\)\)\\n\" - --vtail \" type = g...@type\@_register_static \(\\"@enumn...@\\", _...@enum_name@_values\)\;\\n\\n\" - --vtail \" return type\;\\n}\\n\\n\" + --template poppler-enums.c.template ${poppler_glib_public_headers} > ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${poppler_glib_public_headers} ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + ${CMAKE_CURRENT_SOURCE_DIR}/poppler-enums.c.template ) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
