From db5d9e0b0aa79ac3df8312046c3655ab439131ac Mon Sep 17 00:00:00 2001
From: Tormod Volden <debian.tormod@gmail.com>
Date: Thu, 7 Feb 2019 21:02:50 +0100
Subject: [PATCH 1/2] travis: Use build host default cmake

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
---
 cmake/travis.sh | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/cmake/travis.sh b/cmake/travis.sh
index 7cffe75fe..b23d8ea39 100755
--- a/cmake/travis.sh
+++ b/cmake/travis.sh
@@ -138,31 +138,7 @@ mkdir $build
 builddir=$PWD/$build
 cd $builddir
 
-
-
-# ---------------------------------------------------------
-#
-# get actual cmake
-#
-cmakever=cmake-3.4.1-Linux-x86_64
-
-if [ "$iam" = "$travis" ]; then
-    if [ ! -d $dep/$cmakever ]; then
-          cmakebin=x
-          if [ ! -d $dep/$cmakever ]; then
-              wget --no-check-certificate http://www.cmake.org/files/v3.4/$cmakever.tar.gz
-              checkExitCode
-              cd $dep
-              tar xf $builddir/$cmakever.tar.gz
-              checkExitCode
-              cd $builddir
-          fi
-    fi
-    cmakebin=$dep/$cmakever/bin/cmake
-else
-    cmakebin=cmake
-fi
-$cmakebin --version
+cmake --version
 checkExitCode
 
 server=http://sourceforge.net/projects/kst/files/3rdparty
@@ -289,14 +265,14 @@ else
     noinstaller=-Dkst_noinstaller=1
 fi
 
-#$cmakebin ../kst \
+#cmake ../kst \
 #    -Dkst_release=1  \
 #    -Dkst_version_string=$versionname \
 #    -Dkst_install_prefix=./$versionname \
 #    -Dkst_cross=$dep/$mingwdir/bin/$mingw \
 #    $rev $qtopt $useext $console $noinstaller $generator
 
-$cmakebin ../kst \
+cmake ../kst \
     -Dkst_release=1  \
     -Dkst_merge_files=1 \
     -Dkst_version_string=$versionname \

From 3eb2c4ffbbdba92e8d394eab4fa345cc14c91d48 Mon Sep 17 00:00:00 2001
From: Tormod Volden <debian.tormod@gmail.com>
Date: Thu, 7 Feb 2019 21:13:59 +0100
Subject: [PATCH 2/2] Print usage text to stderr before windows pop-up

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
---
 src/libkstapp/commandlineparser.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp
index 945deb77a..a151ffda5 100644
--- a/src/libkstapp/commandlineparser.cpp
+++ b/src/libkstapp/commandlineparser.cpp
@@ -141,6 +141,10 @@ namespace Kst {
 
 static void printText(const QString& text, const QString& detailText = QString(), const QString& t = QString())
 {
+  QString displayText = QString(text) + QString(detailText) + t;
+
+  fprintf(stderr,"%s\n", qPrintable(displayText));
+  //qWarning("%s", qPrintable(displayText));
 #ifdef Q_OS_WIN
   // Not always console on Windows.
   QMessageBox box(QMessageBox::Information, "Kst", text + t);
@@ -149,10 +153,6 @@ static void printText(const QString& text, const QString& detailText = QString()
   }
   box.exec();
 #endif
-  QString displayText = QString(text) + QString(detailText) + t;
-
-  fprintf(stderr,"%s\n", qPrintable(displayText));
-  //qWarning("%s", qPrintable(displayText));
 }