[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/filters/krita
From: Alex Merry <huntedhacker () tiscali ! co ! uk>
Date: 2008-07-25 22:02:23
Message-ID: 1217023343.373551.1309.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 837865 by alexmerry:
Make the GraphicsMagick check exclude anything later than 1.1.x, since more recent versions are not \
supported.
M +15 -4 CMakeLists.txt
--- trunk/koffice/filters/krita/CMakeLists.txt #837864:837865
@@ -3,12 +3,11 @@
macro_optional_find_package(PNG)
macro_optional_find_package(OpenEXR)
macro_optional_find_package(TIFF)
-macro_optional_find_package(Exiv2)
macro_optional_find_package(JPEG)
-macro_optional_find_package(GraphicsMagick)
macro_optional_find_package(Poppler)
macro_optional_find_package(Kdcraw)
+macro_optional_find_package(Exiv2)
if(EXIV2_FOUND)
# query pkg-config asking for a Exiv2 >= 0.16
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.16 exiv2 RETURN_VALUE _return_VALUE \
OUTPUT_VARIABLE _pkgconfigDevNull ) @@ -20,12 +19,24 @@
endif(_return_VALUE STREQUAL "0")
endif(EXIV2_FOUND)
+macro_optional_find_package(GraphicsMagick)
+if(GRAPHICSMAGICK_FOUND)
+ if(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION GREATER 1)
+ message(STATUS "GraphicsMagick version ${GRAPHICSMAGICK_VERSION} too recent. Only 1.1 series \
supported.") + set(GRAPHICSMAGICK_FOUND FALSE)
+ endif(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION GREATER 1)
+ if(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR GRAPHICSMAGICK_MINOR_VERSION LESS 1)
+ message(STATUS "GraphicsMagick version ${GRAPHICSMAGICK_VERSION} too old. Only 1.1 series \
supported.") + set(GRAPHICSMAGICK_FOUND FALSE)
+ endif(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR GRAPHICSMAGICK_MINOR_VERSION LESS 1)
+endif(GRAPHICSMAGICK_FOUND)
+
macro_log_feature(JPEG_FOUND "jpeg" "The Krita JPEG filter will not be built" "http://www.ijg.org" FALSE \
"")
-macro_log_feature(EXIV2_FOUND "Exiv2" "The Krita JPEG and PNG filters will not be built" \
"http://www.exiv2.org" FALSE "") +macro_log_feature(EXIV2_FOUND "Exiv2" "The Krita JPEG and PNG filters \
will not be built" "http://www.exiv2.org" FALSE "0.16") macro_log_feature(TIFF_FOUND "tiff" "The Krita \
TIFF filter will not be built" "http://www.remotesensing.org/libtiff" FALSE "") \
macro_log_feature(PNG_FOUND "png" "The Krita PNG filter will not be built" \
"http://www.libpng.org/pub/png/libpng.html" FALSE "") macro_log_feature(OPENEXR_FOUND "OpenEXR" "The \
Krita OpenEXR filter will not be built" "http://www.openexr.com" FALSE "")
-macro_log_feature(GRAPHICSMAGICK_FOUND "GraphicsMagick" "The Krita GraphicsMagick filter for various \
file formats (including PSD, XCF) will not be built" "http://www.graphicsmagick.org" FALSE "") \
+macro_log_feature(GRAPHICSMAGICK_FOUND "GraphicsMagick" "The Krita GraphicsMagick filter for various \
file formats (including PSD, XCF) will not be built" "http://www.graphicsmagick.org" FALSE "1.1" \
"GraphicsMagick 1.2 or later is not supported") macro_log_feature( POPPLER_FOUND "poppler-qt4" "The \
Krita PDF filter will not be built (version 0.6.x is currently required)" \
"http://poppler.freedesktop.org" FALSE "")
include_directories(${KRITA_INCLUDES})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic