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

List:       kde-commits
Subject:    [calligra/calligra/2.9] /: Drop PART_QTQUICK & APP_GEMINI from build without OpenGL
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-02-28 20:00:44
Message-ID: E1YRnZ6-0008Hj-OA () scm ! kde ! org
[Download RAW message or body]

Git commit db89661a418de5504f695ab2db0e56184c170965 by Friedrich W. H. Kossebau.
Committed on 28/02/2015 at 19:59.
Pushed by kossebau into branch 'calligra/2.9'.

Drop PART_QTQUICK & APP_GEMINI from build without OpenGL

M  +11   -1    CMakeLists.txt

http://commits.kde.org/calligra/db89661a418de5504f695ab2db0e56184c170965

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ad90d5..8dae485 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,7 +288,7 @@ if (USEOPENGL)
     else(OPENGL_FOUND)
         message(STATUS "Did NOT find OpenGL libraries")
     endif(OPENGL_FOUND)
-    macro_log_feature(HAVE_OPENGL "OpenGL" "OpenGL support" "" FALSE "" "Required by \
parts of Krita and optionally by flake") +    macro_log_feature(HAVE_OPENGL "OpenGL" \
"OpenGL support" "" FALSE "" "Required by Gemini, parts of Krita and optionally by \
flake")  endif(USEOPENGL)
 
 ##
@@ -942,6 +942,16 @@ calligra_drop_product_on_bad_condition( \
PLUGIN_CALLIGRAGEMINI_GIT  LIBQGIT2_FOUND "libqgit2 devel not found"
 )
 
+calligra_drop_product_on_bad_condition( PART_QTQUICK
+    USEOPENGL "USEOPENGL set to FALSE"
+    QT_QTOPENGL_FOUND "Qt OpenGL not found"
+)
+
+calligra_drop_product_on_bad_condition( APP_GEMINI
+    USEOPENGL "USEOPENGL set to FALSE"
+    QT_QTOPENGL_FOUND "Qt OpenGL not found"
+)
+
 #############################################
 ####  Backward compatibility BUILD_x=off ####
 #############################################


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