Set enable-qt ON in json sample enable line

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f30b07e4101690d709da2734b0e18954e41c554..c694dad17b02002121ff62a135dd3c8d245ab041 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,7 @@ if(enable-qt4 OR enable-qt5)
 set(enable-qt ON)
 endif(enable-qt4 OR enable-qt5)
 
-CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" ON)
 MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
 MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
 MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index f577a3489b4949674c4747cf7cf255f63587cdee..f791a50dcf1310ad994a39850ba3a8df47013c70 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -61,11 +61,13 @@ Selection of enabled features during build
  
  if(UNIX AND enable-rvalue)
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-@@ -117,7 +117,7 @@
+@@ -116,8 +116,8 @@
+ set(enable-qt ON)
  endif(enable-qt4 OR enable-qt5)
  
- CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
 -MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
++CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" ON)
 +MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)