Increment version: 9.2.0

[modules/gui.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c8c6acf407c18583d8eb0eb8caf95f89e40e05c..6dd2c7891cdf25f06f0574b0047d83bba501a9b2 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,12 +32,12 @@ ENDIF(WIN32)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 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})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================
@@ -74,7 +74,7 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_GUI_USE_OBSERVERS "Use study observers in GUI (advanced)" ON)
 OPTION(SALOME_BUILD_WITH_QT5 "Build SALOME with Qt 5" ON)
 CMAKE_DEPENDENT_OPTION(SALOME_GUI_BUILD_FRENCH_DOC "Generate SALOME GUI French documentation" OFF
-                       "NOT SALOME_BUILD_DOC" OFF)
+                       "SALOME_BUILD_DOC" OFF)
 
 # Advanced options:
 CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF
@@ -91,12 +91,10 @@ OPTION(SALOME_USE_PVVIEWER "Enable ParaView visualization (Mandatory in classic
 
 CMAKE_DEPENDENT_OPTION(SALOME_USE_SALOMEOBJECT "Enable Salome Object (Mandatory in classic configurations)" ON
                        "SALOME_LIGHT_ONLY" ON)
-OPTION(SALOME_USE_SINGLE_DESKTOP "Enable multiple document interface" ON)
 
 MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_VTKVIEWER SALOME_USE_GRAPHICSVIEW SALOME_USE_PVVIEWER)
 MARK_AS_ADVANCED(SALOME_USE_SALOMEOBJECT SALOME_USE_OCCVIEWER SALOME_USE_GLVIEWER SALOME_USE_PLOT2DVIEWER)
 MARK_AS_ADVANCED(SALOME_USE_PYCONSOLE SALOME_USE_QXGRAPHVIEWER SALOME_USE_PYVIEWER)
-MARK_AS_ADVANCED(SALOME_USE_SINGLE_DESKTOP)
 
 # Prerequisites
 # =============
@@ -172,11 +170,11 @@ ELSE()
   SET(QT_SALOME_VERSION 5)
   SET(SALOME_GUI_ENABLE_QTXWEBBROWSER TRUE)
   IF(NOT "${QT_VERSION}" VERSION_LESS "5.6.0")
-    # Check that WebEngine component was found
-    IF(NOT Qt5WebEngine_FOUND)
+    # Check that WebEngineWidgets component was found
+    IF(NOT Qt5WebEngineWidgets_FOUND)
       SET(SALOME_GUI_ENABLE_QTXWEBBROWSER FALSE)
-        ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
-        MESSAGE("Qt5WebEngine is not found, SALOME internal help browser will be unavailable !")
+      ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
+      MESSAGE("Qt5WebEngineWidgets is not found, SALOME internal help browser will be unavailable !")
     ENDIF()
   ENDIF()
 ENDIF()