X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=SalomeGUIConfig.cmake.in;h=925c10c243f82410d6dd3b873e63a2a9d1ed5707;hb=9ee7121c89dee1b85745c54ffef953855c6b8041;hp=efe54f5a13d05edc4002750cb6b3ecff9dd5c510;hpb=580b61cb9fdeb6bf11cdc7cb13be97bbc53f2296;p=modules%2Fgui.git

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index efe54f5a1..925c10c24 100644
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2020  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
@@ -50,7 +50,6 @@ SET(GUI_DEFINITIONS "@KERNEL_DEFINITIONS@")
 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@)
@@ -111,20 +110,15 @@ 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@")
-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(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")    
+SET_AND_CHECK(QT5_ROOT_DIR_EXP "@PACKAGE_QT_ROOT_DIR@")
+SET_AND_CHECK(PYQT5_ROOT_DIR_EXP "@PACKAGE_PYQT_ROOT_DIR@")
+SET_AND_CHECK(OPENCASCADE_ROOT_DIR_EXP "@PACKAGE_OPENCASCADE_ROOT_DIR@")
 
 # Optional level 1 prerequisites:
 IF(SALOME_USE_GLVIEWER)
   SET_AND_CHECK(OPENGL_ROOT_DIR_EXP "@PACKAGE_OPENGL_ROOT_DIR@") 
 ENDIF()
-IF(SALOME_USE_VTKVIEWER) 
+IF(SALOME_USE_VTKVIEWER)
   SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@")
 ENDIF()
 IF(SALOME_USE_PLOT2DVIEWER)
@@ -207,6 +201,8 @@ SET(GUI_QDS QDS)
 SET(GUI_qtx qtx)
 SET(GUI_QxScene QxScene)
 SET(GUI_SalomeApp SalomeApp)
+SET(GUI_SalomeAppSL SalomeAppSL)
+SET(GUI_SalomeAppImpl SalomeAppImpl)
 SET(GUI_SalomeIDLGUI SalomeIDLGUI)
 SET(GUI_SalomeObject SalomeObject)
 SET(GUI_SalomePrs SalomePrs)