From cf8c34b4b3604be0b9f279f9f41c950b5fd3c880 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Mon, 13 Jul 2015 17:28:18 +0200
Subject: [PATCH] change version
---
CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0407b6..86d42d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ message( STATUS "CMAKE_VERBOSE_MAKEFILE: " ${CMAKE_VERBOSE_MAKEFILE} )
message (STATUS "MODULE_PATH: " ${CMAKE_MODULE_PATH})
set(CMAKE_COLOR_MAKEFILE ON)
set(JPSGUI_MAJOR_VERSION 0)
-set(JPSGUI_MINOR_VERSION 1)
+set(JPSGUI_MINOR_VERSION 7)
set(JPSGUI_PATCH_VERSION 0)
set(JPSGUI_VERSION
${JPSGUI_MAJOR_VERSION}.${JPSGUI_MINOR_VERSION}.${JPSGUI_PATCH_VERSION})
@@ -109,6 +109,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
+IF (WIN32)
+ SET (QT_USE_QTMAIN TRUE)
+ENDIF (WIN32)
+
#--------------- here comes QT. Version problem (4 or 5?)
FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake REQUIRED)
@@ -217,7 +221,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --c++11 -Minform=inform")
endif()
-
+message(STATUS "INSTALL_PREFIX: " ${CMAKE_INSTALL_PREFIX})
#--------------------------------------------------------------------------------
# Now the installation stuff below
#--------------------------------------------------------------------------------
--
GitLab