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

List:       kde-commits
Subject:    [digikam] /: Synchronize build flags to bootstrap (enable opencv3 & mysql by default)
From:       Simon Frei <null () kde ! org>
Date:       2017-07-31 19:22:55
Message-ID: E1dcGHI-0006QX-08 () code ! kde ! org
[Download RAW message or body]

Git commit 79bf081c5ee77dd518afeb3dd0b7ceae660d1449 by Simon Frei.
Committed on 31/07/2017 at 19:21.
Pushed by sfrei into branch 'master'.

Synchronize build flags to bootstrap (enable opencv3 & mysql by default)

BUG: 382953
FIXED-IN: 5.7.0

M  +3    -3    CMakeLists.txt

https://commits.kde.org/digikam/79bf081c5ee77dd518afeb3dd0b7ceae660d1449

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59e82b6965..6ba19b3d60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ include(MacroBoolTo01)
 
 # ==================================================================================================
  
-option(ENABLE_OPENCV3               "Build digiKam with OpenCV3 instead OpenCV2 \
(default=OFF)"                           OFF) +option(ENABLE_OPENCV3               \
"Build digiKam with OpenCV3 instead OpenCV2 (default=ON)"                            \
ON)  option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer \
support (default=OFF)"                         OFF)  \
option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support \
(default=OFF)"                         OFF)  option(ENABLE_MEDIAPLAYER           \
"Build digiKam with Media Player support (default=OFF)"                              \
OFF) @@ -106,8 +106,8 @@ option(ENABLE_DBUS                  "Build digiKam with DBUS \
support (default=ON  option(ENABLE_APPSTYLES             "Build digiKam with support \
for changing the widget application style (default=OFF)" OFF)  
 # Mysql support options (experimental):
-option(ENABLE_MYSQLSUPPORT          "Build digiKam with MySQL dabatase support \
                (default=OFF)"                            OFF)
-option(ENABLE_INTERNALMYSQL         "Build digiKam with internal MySQL server \
executable (default=OFF)"                  OFF) +option(ENABLE_MYSQLSUPPORT          \
"Build digiKam with MySQL dabatase support (default=ON)"                             \
ON) +option(ENABLE_INTERNALMYSQL         "Build digiKam with internal MySQL server \
executable (default=ON)"                   ON)  
 
 # Debug options:


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