1 files changed, 12 insertions, 37 deletions
diff --git a/source/kde/kde/cmake/marble b/source/kde/kde/cmake/marble
index 8778f2c90..9fc7c82d3 100644
--- a/source/kde/kde/cmake/marble
+++ b/source/kde/kde/cmake/marble
@@ -1,7 +1,6 @@
-function marble_configure()
-{
+mkdir cmake-build
+cd cmake-build
   cmake \
-    $* \
     $KDE_OPT_ARGS \
     -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -11,44 +10,20 @@ function marble_configure()
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
-    -DKDE_INSTALL_SYSCONFDIR=/etc/kde \
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
-    -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
-    -DBUILD_TESTING=OFF \
-    ..
-}
-
-# Configure the Qt5 support first:
-mkdir cmake-build_qt5
-cd cmake-build_qt5
-marble_configure \
     -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
-    -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
     -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca
+    -DBUILD_TESTING=OFF \
+    -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_TOUCH=ON \
+    -DBUILD_MARBLE_EXAMPLES=OFF \
+    -DBUILD_MARBLE_TESTS=OFF \
+    -DMOBILE=OFF \
+    ..
 
-#
-#cd -
-#
-## Add Qt4 support (needed by libkgeomap):
-#mkdir cmake-build_qt4
-#cd cmake-build_qt4
-#QT5DIR="" \
-#QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-#marble_configure \
-#    -DQT_MOC_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/moc \
-#    -DQT_QMAKE_EXECUTABLE=/usr/lib${LIBDIRSUFFIX}/qt/bin/qmake \
-#    -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt/plugins \
-#    -DQT_PLUGINS_DIR=lib$LIBDIRSUFFIX/qt/plugins \
-#    -DMARBLE_PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/marble4/plugins \
-#    -DQT5BUILD=OFF \
-#    -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON \
-#    -DCMAKE_DISABLE_FIND_PACKAGE_KF5=ON \
-#    -DBUILD_MARBLE_TESTS=OFF \
-#    -DBUILD_MARBLE_APPS=OFF
-#
-## make can pick up from here, and first build the Qt4, then Qt5 stuff.
-#