2016-09-23 12:46:52 +00:00
|
|
|
From 9e291325f5d2568834fd0d590e5e99af129d9518 Mon Sep 17 00:00:00 2001
|
2016-07-06 00:59:39 +00:00
|
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
|
|
Date: Tue, 5 Jul 2016 18:47:56 -0600
|
|
|
|
Subject: [PATCH] optionally enable OpenGL
|
|
|
|
|
|
|
|
Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
|
|
---
|
|
|
|
CMakeLists.txt | 3 ++-
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2016-09-23 12:46:52 +00:00
|
|
|
index d3e64b5..1dabead 100644
|
2016-07-06 00:59:39 +00:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
@@ -104,6 +104,7 @@ option(ENABLE_KFILEMETADATASUPPORT "Build digiKam with KDE files indexer suppor
|
2016-09-23 12:46:52 +00:00
|
|
|
option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)" OFF)
|
|
|
|
option(ENABLE_MEDIAPLAYER "Build digiKam with QtMultimedia support (default=OFF)" OFF)
|
|
|
|
option(ENABLE_DBUS "Build digiKam with DBUS support (default=ON)" ON)
|
2016-07-06 00:59:39 +00:00
|
|
|
+option(ENABLE_OPENGL "Build digiKam with OpenGL support (default=ON)" ON)
|
2016-09-23 12:46:52 +00:00
|
|
|
option(ENABLE_APPSTYLES "Build digiKam with support for changing the widget application style (default=OFF)" OFF)
|
2016-07-06 00:59:39 +00:00
|
|
|
|
|
|
|
# Mysql support options (experimental):
|
2016-09-23 12:46:52 +00:00
|
|
|
@@ -286,7 +287,7 @@ else()
|
2016-07-06 00:59:39 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
# decide if Presentation tool can be built with OpenGL
|
|
|
|
-if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND)
|
|
|
|
+if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL)
|
|
|
|
set(HAVE_OPENGL TRUE)
|
|
|
|
elseif()
|
|
|
|
set(HAVE_OPENGL FALSE)
|
|
|
|
--
|
2016-09-23 12:46:52 +00:00
|
|
|
2.9.2
|
2016-07-06 00:59:39 +00:00
|
|
|
|