X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeGUIConfig.cmake.in;h=9fdc28d7daf9578b6d805bed36133556874faabb;hb=e70f3c39;hp=a7ee85bbe10f3c43951b5fa5c187f90d2b9d1c10;hpb=b330d1f023e897cfddde5a0cb7efd949c317d5a5;p=modules%2Fgui.git diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in index a7ee85bbe..9fdc28d7d 100644 --- a/SalomeGUIConfig.cmake.in +++ b/SalomeGUIConfig.cmake.in @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 @@ -47,9 +47,10 @@ SET(GUI_DEFINITIONS "@KERNEL_DEFINITIONS@") #### Now the specificities # Options exported by the package: -SET(SALOME_GUI_BUILD_DOC @SALOME_BUILD_DOC@) -SET(SALOME_GUI_BUILD_TESTS @SALOME_BUILD_TESTS@) -SET(SALOME_GUI_LIGHT_ONLY @SALOME_LIGHT_ONLY@) +SET(SALOME_GUI_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_GUI_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_GUI_LIGHT_ONLY @SALOME_LIGHT_ONLY@) +SET(SALOME_GUI_BUILD_WITH_QT5 @SALOME_BUILD_WITH_QT5@) # Advanced options SET(SALOME_USE_OCCVIEWER @SALOME_USE_OCCVIEWER@) @@ -59,17 +60,15 @@ SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@) SET(SALOME_USE_GRAPHICSVIEW @SALOME_USE_GRAPHICSVIEW@) SET(SALOME_USE_QXGRAPHVIEWER @SALOME_USE_QXGRAPHVIEWER@) SET(SALOME_USE_PVVIEWER @SALOME_USE_PVVIEWER@) +SET(SALOME_USE_PYVIEWER @SALOME_USE_PYVIEWER@) SET(SALOME_USE_PYCONSOLE @SALOME_USE_PYCONSOLE@) SET(SALOME_USE_SALOMEOBJECT @SALOME_USE_SALOMEOBJECT@) -SET(SALOME_USE_SINGLE_DESKTOP @SALOME_USE_SINGLE_DESKTOP@) SET(SALOME_GUI_USE_OBSERVERS @SALOME_GUI_USE_OBSERVERS@) +SET(SALOME_GUI_USE_OPENGL2 @SALOME_GUI_USE_OPENGL2@) IF(SALOME_GUI_LIGHT_ONLY) LIST(APPEND GUI_DEFINITIONS "-DGUI_DISABLE_CORBA") ENDIF() -IF(SALOME_USE_SINGLE_DESKTOP) - LIST(APPEND GUI_DEFINITIONS "-DSINGLE_DESKTOP") -ENDIF() IF(SALOME_GUI_USE_OBSERVERS) LIST(APPEND GUI_DEFINITIONS "-DWITH_SALOMEDS_OBSERVER") ENDIF() @@ -82,6 +81,10 @@ ENDIF() IF(NOT SALOME_USE_VTKVIEWER) LIST(APPEND GUI_DEFINITIONS "-DDISABLE_VTKVIEWER") +ELSE() + IF(SALOME_GUI_USE_OPENGL2) + LIST(APPEND GUI_DEFINITIONS "-DVTK_OPENGL2") + ENDIF() ENDIF() IF(NOT SALOME_USE_PLOT2DVIEWER) LIST(APPEND GUI_DEFINITIONS "-DDISABLE_PLOT2DVIEWER") @@ -92,6 +95,9 @@ ENDIF() IF (NOT SALOME_USE_PVVIEWER) LIST(APPEND GUI_DEFINITIONS "-DDISABLE_PVVIEWER") ENDIF() +IF(NOT SALOME_USE_PYVIEWER) + LIST(APPEND GUI_DEFINITIONS "-DDISABLE_PYVIEWER") +ENDIF() IF(NOT SALOME_USE_PYCONSOLE) LIST(APPEND GUI_DEFINITIONS "-DDISABLE_PYCONSOLE") ENDIF() @@ -105,9 +111,14 @@ ENDIF() # Level 1 prerequisites: SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@") -SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@") -SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@") -SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@") +IF(NOT SALOME_GUI_BUILD_WITH_QT5) + SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT_ROOT_DIR@") + SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT_ROOT_DIR@") +ELSE() + SET_AND_CHECK(QT5_ROOT_DIR_EXP "@PACKAGE_QT_ROOT_DIR@") + SET_AND_CHECK(PYQT5_ROOT_DIR_EXP "@PACKAGE_PYQT_ROOT_DIR@") +ENDIF() +SET_AND_CHECK(OPENCASCADE_ROOT_DIR_EXP "@PACKAGE_OPENCASCADE_ROOT_DIR@") # Optional level 1 prerequisites: IF(SALOME_USE_GLVIEWER) @@ -120,32 +131,34 @@ IF(SALOME_USE_PLOT2DVIEWER) SET_AND_CHECK(QWT_ROOT_DIR_EXP "@PACKAGE_QWT_ROOT_DIR@") ENDIF() -# For all prerequisites, load the corresponding targets if the package was used +# For all prerequisites, load the corresponding targets if the package was used # in CONFIG mode. This ensures dependent projects link correctly # without having to set LD_LIBRARY_PATH: -SET(_PREREQ @_PREREQ_LIST@) -SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@) -SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@") -LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) -IF(NOT _list_len EQUAL 0) +SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@) +SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@) +SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@") +LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@) +IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0) # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... - MATH(EXPR _range "${_list_len}-1") - FOREACH(_p RANGE ${_range}) - LIST(GET _PREREQ ${_p} _pkg ) - LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) - LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo) - MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") - IF(NOT _pkg_compo) - FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE - PATHS "${_pkg_dir}" - NO_DEFAULT_PATH) - ELSE() - STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}") - MESSAGE(STATUS "===> (components: ${_pkg_compo})") - FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE - COMPONENTS ${_compo_lst} - PATHS "${_pkg_dir}" - NO_DEFAULT_PATH) + MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1") + FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@}) + LIST(GET _PREREQ_@PROJECT_NAME@ ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@ ) + LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@) + LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@) + IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@}) + MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...") + IF(NOT _pkg_compo_@PROJECT_NAME@) + FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE + PATHS "${_pkg_dir_@PROJECT_NAME@}" + NO_DEFAULT_PATH) + ELSE() + STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}") + MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})") + FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE + COMPONENTS ${_compo_lst_@PROJECT_NAME@} + PATHS "${_pkg_dir_@PROJECT_NAME@}" + NO_DEFAULT_PATH) + ENDIF() ENDIF() ENDFOREACH() ENDIF() @@ -188,6 +201,8 @@ SET(GUI_OpenGLUtils OpenGLUtils) SET(GUI_Plot2d Plot2d) SET(GUI_PyConsole PyConsole) SET(GUI_PyInterp PyInterp) +SET(GUI_PyEditor PyEditor) +SET(GUI_PyViewer PyViewer) SET(GUI_QDS QDS) SET(GUI_qtx qtx) SET(GUI_QxScene QxScene) @@ -212,7 +227,7 @@ SET(GUI_ViewerTools ViewerTools) SET(GUI_ViewerData ViewerData) SET(GUI_VTKViewer VTKViewer) SET(GUI_PVViewer PVViewer) -SET(GUI_vtkEDFOverloads vtkEDFOverloads) +SET(GUI_PVServerService PVServerService) SET(GUI_vtkTools vtkTools) SET(GUI_SalomeGuiHelpers SalomeGuiHelpers) SET(GUI_SalomeTreeData SalomeTreeData)