X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9a6313fb76cdb5427326e456555362135b5f4a2d;hb=64205612db5db55a3ec1c65bee46c3e010dd5d1e;hp=2e834cbe40502449c38c1c0e5a2e48f2ff4c5ad8;hpb=2d7d8d3dcda4ddfe19af04c5d428f2bb06f7ca80;p=modules%2Fgui.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e834cbe4..9a6313fb7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,9 @@ PROJECT(SalomeGUI C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
+IF(WIN32)
+  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
+ENDIF(WIN32)
 
 # Versioning
 # ===========
@@ -30,18 +33,27 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
 
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
   INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
@@ -51,11 +63,9 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 
 # Platform setup
 # ==============
-INCLUDE(SalomeSetupPlatform)   # From KERNEL
+INCLUDE(SalomeSetupPlatform)   # From CONFIGURATION
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 # User options
 # ============
@@ -154,9 +164,19 @@ 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)
+  SET(SALOME_GUI_ENABLE_QTXWEBBROWSER TRUE)
 ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
   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)
+      SET(SALOME_GUI_ENABLE_QTXWEBBROWSER FALSE)
+        ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
+        MESSAGE("Qt5WebEngine is not found, SALOME internal help browser will be unavailable !")
+    ENDIF()
+  ENDIF()
 ENDIF()
 
 # PyQt
@@ -191,10 +211,15 @@ IF(SALOME_USE_VTKVIEWER)
   # Required components are listed in the FindSalomeVTK.cmake file: 
   FIND_PACKAGE(SalomeVTK) 
   SALOME_LOG_OPTIONAL_PACKAGE(VTK SALOME_USE_VTKVIEWER)
+  IF(${VTK_RENDERING_BACKEND} STREQUAL "OpenGL2")
+    ADD_DEFINITIONS("-DVTK_OPENGL2")
+    SET(SALOME_GUI_USE_OPENGL2 TRUE)
+  ENDIF()
 ELSE()
   ADD_DEFINITIONS("-DDISABLE_VTKVIEWER")
 ENDIF()
 
+
 # - Plot2d viewer: Qwt
 IF(SALOME_USE_PLOT2DVIEWER)
   FIND_PACKAGE(SalomeQwt)
@@ -312,7 +337,7 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets 
-    caf CAM CASCatch DDS Event LightApp LogWindow ObjBrowser
+    CAM CASCatch DDS Event LightApp LogWindow ObjBrowser
     QDS qtx SalomePrs SalomeStyle std SUITApp suit ViewerTools ViewerData
     ImageComposer
 )