From 6a77db67ffc1eb7e8714958976403883f584de47 Mon Sep 17 00:00:00 2001 From: xarkes Date: Sat, 23 Feb 2019 08:24:31 +0100 Subject: [PATCH] Disabled Python building by default (#1214) Many people do not have shibokken or jupyter or the python libraries on their computer, so it's better not to enable those by default. --- src/CMakeLists.txt | 8 ++++---- src/Cutter.pro | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 751e0a66..dd03b08b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,9 +6,9 @@ include(DisallowInSource) set(CUTTER_PYTHON_MIN 3.5) -option(CUTTER_ENABLE_PYTHON "Enable Python integration. Requires Python >= ${CUTTER_PYTHON_MIN}." ON) -option(CUTTER_ENABLE_PYTHON_BINDINGS "Enable generating Python bindings with Shiboken2. Unused if CUTTER_ENABLE_PYTHON=OFF." ON) -option(CUTTER_ENABLE_JUPYTER "Enable Jupyter integration. Unused if CUTTER_ENABLE_PYTHON=OFF." ON) +option(CUTTER_ENABLE_PYTHON "Enable Python integration. Requires Python >= ${CUTTER_PYTHON_MIN}." OFF) +option(CUTTER_ENABLE_PYTHON_BINDINGS "Enable generating Python bindings with Shiboken2. Unused if CUTTER_ENABLE_PYTHON=OFF." OFF) +option(CUTTER_ENABLE_JUPYTER "Enable Jupyter integration. Unused if CUTTER_ENABLE_PYTHON=OFF." OFF) option(CUTTER_ENABLE_QTWEBENGINE "Use QtWebEngine for in-app Jupyter Browser. Unused if CUTTER_ENABLE_JUPYTER=OFF." OFF) if(NOT CUTTER_ENABLE_PYTHON) @@ -179,4 +179,4 @@ endif() if(CUTTER_ENABLE_PYTHON AND CUTTER_ENABLE_JUPYTER AND CUTTER_ENABLE_QTWEBENGINE) target_link_libraries(Cutter Qt5::WebEngineWidgets) -endif() \ No newline at end of file +endif() diff --git a/src/Cutter.pro b/src/Cutter.pro index f6410d2d..cb55e5c9 100644 --- a/src/Cutter.pro +++ b/src/Cutter.pro @@ -32,10 +32,10 @@ QT += core gui widgets svg network QT_CONFIG -= no-pkg-config CONFIG += c++11 -!defined(CUTTER_ENABLE_PYTHON, var) CUTTER_ENABLE_PYTHON=true +!defined(CUTTER_ENABLE_PYTHON, var) CUTTER_ENABLE_PYTHON=false equals(CUTTER_ENABLE_PYTHON, true) CONFIG += CUTTER_ENABLE_PYTHON -!defined(CUTTER_ENABLE_PYTHON_BINDINGS, var) CUTTER_ENABLE_PYTHON_BINDINGS=true +!defined(CUTTER_ENABLE_PYTHON_BINDINGS, var) CUTTER_ENABLE_PYTHON_BINDINGS=false equals(CUTTER_ENABLE_PYTHON, true) { equals(CUTTER_ENABLE_PYTHON_BINDINGS, true) { CONFIG += CUTTER_ENABLE_PYTHON_BINDINGS @@ -43,7 +43,7 @@ equals(CUTTER_ENABLE_PYTHON, true) { } } -!defined(CUTTER_ENABLE_JUPYTER, var) CUTTER_ENABLE_JUPYTER=true +!defined(CUTTER_ENABLE_JUPYTER, var) CUTTER_ENABLE_JUPYTER=false equals(CUTTER_ENABLE_PYTHON, true) { equals(CUTTER_ENABLE_JUPYTER, true) CONFIG += CUTTER_ENABLE_JUPYTER }