diff --git a/CMakeLists.txt b/CMakeLists.txt index 29889930370b7a28aa2fcc922b33290ae13e861c..a584d5888f93552a4ed608aa5fdb2439055646e2 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 64bd3da6ec157d8492e1e9a1bbdb7fe6b62e774e..8b9655567da60246a97c5c07cfb18bc300553c26 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 8e8018010f2e9d96426e6a5d8f80fea255524e3c..92bbd4a9c3cc9a7e3bcd86a7d82d14213f8c7e2b 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