Merge branch 'V8_0_0_BR'

[modules/gui.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16a00d96bd0ce8f90fea402abbd031669ba23484..ceb25ef0a6b5b00045013f8259e0f29eb9aa0623 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -152,8 +152,10 @@ ENDIF()
 IF(NOT SALOME_BUILD_WITH_QT5)
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork)
   ADD_DEFINITIONS("-DUSE_SALOME_STYLE")
+  SET(QT_SALOME_VERSION 4)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
+  SET(QT_SALOME_VERSION 5)
 ENDIF()
 
 # PyQt