From: Dimitrios Eftaxiopoulos Date: Sat, 5 Sep 2015 19:46:07 +0000 (+0300) Subject: Set enable-qt ON in json sample enable line X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~91 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81eb7778d0bb1454aaea6282981c5c1a5833d1f0;p=mathgl.git Set enable-qt ON in json sample enable line --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f30b07..c694dad 100644 --- 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 f577a34..f791a50 100644 --- 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)