[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcm-grub2] /: Compile with QT_NO_KEYWORDS, QT_STRICT_ITERATORS.
From:       Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date:       2013-10-24 17:54:33
Message-ID: E1VZP7B-0001vj-Ct () scm ! kde ! org
[Download RAW message or body]

Git commit a1ce8c29bff8eaa7e37557726401a762740b7a45 by Konstantinos Smanis.
Committed on 24/10/2013 at 14:22.
Pushed by ksmanis into branch 'master'.

Compile with QT_NO_KEYWORDS, QT_STRICT_ITERATORS.

M  +4    -1    CMakeLists.txt

http://commits.kde.org/kcm-grub2/a1ce8c29bff8eaa7e37557726401a762740b7a45

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5066cc8..010debc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,10 @@ find_package(KDE4 4.4.0 REQUIRED)
 include(KDE4Defaults)
 include(GRUBPaths)
 
-add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_USE_FAST_CONCATENATION \
-DQT_USE_FAST_OPERATOR_PLUS -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_HDRI_ENABLE=0) \
+# Qt +add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS \
-DQT_STRICT_ITERATORS -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +# \
ImageMagick +add_definitions(-DMAGICKCORE_HDRI_ENABLE=0 \
-DMAGICKCORE_QUANTUM_DEPTH=16)  
 macro_optional_find_package(ImageMagick COMPONENTS Magick++ MagickCore)
 macro_log_feature(ImageMagick_FOUND "ImageMagick" "Create splash images compatible \
with GRUB2" "http://www.imagemagick.org/" FALSE "" "")


[prev in list] [next in list] [prev in thread] [next in thread]