[poppler] cmake/modules config.h.cmake

Pino Toscano pino at kemper.freedesktop.org
Mon Feb 22 04:48:40 PST 2010


 cmake/modules/FindCairo.cmake |   18 ------------------
 config.h.cmake                |    3 ---
 2 files changed, 21 deletions(-)

New commits:
commit cbb7519904d9b6395d0128e16a79324e4b8bfcc0
Author: Pino Toscano <pino at kde.org>
Date:   Mon Feb 22 13:15:11 2010 +0100

    [CMake] no more need to build system check for the Cairo blend modes
    
    followup of 880890c14e99a954b365a3a6b59deeffa5304d30 for the cmake build system

diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake
index ccf8208..a0a8400 100644
--- a/cmake/modules/FindCairo.cmake
+++ b/cmake/modules/FindCairo.cmake
@@ -37,24 +37,6 @@ 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 ec12045..1253549 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,8 +1,5 @@
 /* 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
 


More information about the poppler mailing list