From c60e29e2b33c260fb62e27a80f1b5166f02affab Mon Sep 17 00:00:00 2001
From: Erik Andresen <e.andresen@uni-wuppertal.de>
Date: Tue, 26 Apr 2016 10:31:05 +0200
Subject: [PATCH] change version number
---
CMakeLists.txt | 3 ++-
src/MainWindow.cpp | 4 ++--
src/general/Macros.h | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2988993..a584d58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@
# -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON (default OFF)
# -DBUILD_TESTING=ON (default OFF)
# MARK_AS_ADVANCED (BUILD_TESTING CMAKE_BUILD_TYPE=Debug)
+#windows flags: -DDESIRED_QT_VERSION=5 -DCMAKE_PREFIX_PATH=D:\Qt32bit\Qt5.4.1\5.4\msvc2013 -DCMAKE_PREFIX_PATH=VTK.0.0\VTK-7.0.0\build -G "Visual Studio 12 2013"
#--------------------------------------------------------------------------
@@ -49,7 +50,7 @@ message( STATUS "PROJECT_SOURCE_DIR points to " ${PROJECT_SOURCE_DIR})
message (STATUS "MODULE_PATH: " ${CMAKE_MODULE_PATH})
set(CMAKE_COLOR_MAKEFILE ON)
set(JPSVIS_MAJOR_VERSION 0)
-set(JPSVIS_MINOR_VERSION 7)
+set(JPSVIS_MINOR_VERSION 8)
set(JPSVIS_PATCH_VERSION 0)
set(JPSVIS_VERSION
${JPSVIS_MAJOR_VERSION}.${JPSVIS_MINOR_VERSION}.${JPSVIS_PATCH_VERSION})
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 64bd3da..8b96555 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -225,8 +225,8 @@ MainWindow::MainWindow(QWidget *parent) :
if(argCount!=arguments.size()-1) {
bool ok=false;
int port = arguments[++argCount].toInt(&ok);
- Debug::
- Debug::Messages(" listening port: %d",port);
+// Debug::
+// Debug::Messages(" listening port: %d",port);
if (ok) {
SystemSettings::setListeningPort(port);
diff --git a/src/general/Macros.h b/src/general/Macros.h
index 8e80180..92bbd4a 100644
--- a/src/general/Macros.h
+++ b/src/general/Macros.h
@@ -50,8 +50,8 @@
//#define _SIMULATOR 1
//#define _USE_PROTOCOL_BUFFER 1
-#define JPS_OLD_VERSION "0.5" // this version is still supported
-#define JPS_VERSION_MINOR "6"
+#define JPS_OLD_VERSION "0.7" // this version is still supported
+#define JPS_VERSION_MINOR "8"
#define JPS_VERSION_MAJOR "0"
#define JPS_VERSION JPS_VERSION_MAJOR "." JPS_VERSION_MINOR
--
GitLab