-# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2019 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
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})
OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON)
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
"SALOME_BUILD_DOC" OFF)
ENDIF()
# Qt
-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 WebEngineWidgets component was found
- IF(NOT Qt5WebEngineWidgets_FOUND)
- SET(SALOME_GUI_ENABLE_QTXWEBBROWSER FALSE)
- ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
- MESSAGE("Qt5WebEngineWidgets is not found, SALOME internal help browser will be unavailable !")
- ENDIF()
+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 WebEngineWidgets component was found
+ IF(NOT Qt5WebEngineWidgets_FOUND)
+ SET(SALOME_GUI_ENABLE_QTXWEBBROWSER FALSE)
+ ADD_DEFINITIONS("-DDISABLE_QTXWEBBROWSER")
+ MESSAGE("Qt5WebEngineWidgets is not found, SALOME internal help browser will be unavailable !")
ENDIF()
ENDIF()
# PyQt
-IF (NOT SALOME_BUILD_WITH_QT5)
- FIND_PACKAGE(SalomePyQt4 REQUIRED)
-ELSE()
- FIND_PACKAGE(SalomePyQt5 REQUIRED)
-ENDIF()
+FIND_PACKAGE(SalomePyQt5 REQUIRED)
# Optional packages for GUI and their pre-requisites
# Accumulate environment variables for GUI module
SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}
+ ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}
${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED})
SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
ENDIF()
ADD_SUBDIRECTORY(adm_local)
-ADD_SUBDIRECTORY(resources)
ADD_SUBDIRECTORY(src)
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
# Ensure the variables are always defined for the configure:
SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
SET(SIP_ROOT_DIR "${SIP_ROOT_DIR}")
-IF(NOT SALOME_BUILD_WITH_QT5)
- SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
- SET(PYQT_ROOT_DIR "${PYQT4_ROOT_DIR}")
-ELSE()
- SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
- SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
-ENDIF()
+SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
+SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
+
SET(OPENCASCADE_ROOT_DIR "${OPENCASCADE_ROOT_DIR}")
SET(OPENGL_ROOT_DIR "${OPENGL_ROOT_DIR}")
SET(VTK_ROOT_DIR "${VTK_ROOT_DIR}")
SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
# Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-IF(NOT SALOME_BUILD_WITH_QT5)
- SALOME_CONFIGURE_PREPARE(OpenCASCADE OpenGL Qt4 PyQt4 Qwt SIP VTK)
-ELSE()
- SALOME_CONFIGURE_PREPARE(OpenCASCADE OpenGL Qt5 PyQt5 Qwt SIP VTK)
-ENDIF()
+SALOME_CONFIGURE_PREPARE(OpenCASCADE OpenGL Qt5 PyQt5 Qwt SIP VTK)
CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake