CMakeLists.txt | 6 +++--- Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit ec9138b574c7226ad733880d3d43b86bb72073f4 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 23:17:50 2010 +0100 [autotools] add also cpp/tests/CMakeLists.txt to the "dist files" diff --git a/Makefile.am b/Makefile.am index ce4c172..eaaac4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ pkgconfig_DATA = \ # Add CMake buildsystem files here so they get added on make dist EXTRA_DIST += \ + cpp/tests/CMakeLists.txt \ cpp/CMakeLists.txt \ glib/demo/CMakeLists.txt \ glib/CMakeLists.txt \ commit ef3258d6fc57e7a62d951cc826804e50e8e1b526 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 23:14:12 2010 +0100 [autotools] fix location of poppler-config.h.cmake diff --git a/Makefile.am b/Makefile.am index aedf60f..ce4c172 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST += \ cmake/modules/FindLIBOPENJPEG.cmake \ config.h.cmake \ poppler-cairo.pc.cmake \ - poppler-config.h.cmake \ + poppler/poppler-config.h.cmake \ poppler-cpp.pc.cmake \ poppler-glib.pc.cmake \ poppler-qt.pc.cmake \ commit fd1d9c882997ff35acd5a458e9dfeba3ad6c8b25 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 22:42:06 2010 +0100 [CMake] just enable what needed each time diff --git a/CMakeLists.txt b/CMakeLists.txt index 5001d19..0a488e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,11 @@ else(WIN32) endif(WIN32) set(FONT_CONFIGURATION "${_default_fontconfiguration}" CACHE STRING "The font configuration backend (win32|fontconfig).") string(TOLOWER "${FONT_CONFIGURATION}" font_configuration) +set(WITH_FONTCONFIGURATION_WIN32 OFF) +set(WITH_FONTCONFIGURATION_FONTCONFIG OFF) if(font_configuration STREQUAL "win32") set(WITH_FONTCONFIGURATION_WIN32 ON) - set(WITH_FONTCONFIGURATION_FONTCONFIG OFF) elseif(font_configuration STREQUAL "fontconfig") - set(WITH_FONTCONFIGURATION_WIN32 OFF) set(WITH_FONTCONFIGURATION_FONTCONFIG ON) else(font_configuration STREQUAL "win32") message(FATAL_ERROR "Invalid font configuration setting: ${FONT_CONFIGURATION}") commit 476bde472a7e694afde96a04ea335fe9582d6fad Author: Pino Toscano <[email protected]> Date: Sun Mar 7 22:39:45 2010 +0100 [CMake] add small description for the zlib option taken from two bits in configure.ac diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a6e094..5001d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ option(ENABLE_CPP "Compile poppler cpp wrapper." ON) option(ENABLE_ABIWORD "Build the Abiword backend." ON) option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON) option(ENABLE_LCMS "Use liblcms for color management." ON) -option(ENABLE_ZLIB "TODO" OFF) +option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF) option(USE_EXCEPTIONS "Throw exceptions to deal with not enough memory and similar problems." OFF) option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF) option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
