From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2018 13:37:26 +0000 (+0300)
Subject: Merge from oscar/imps_2017 (from GUI module)
X-Git-Tag: V8_5_0b1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ad4e215c9066f7f8edde570dbcf9a2bfdb03ee31;p=tools%2Fconfiguration.git

Merge from oscar/imps_2017 (from GUI module)
---

diff --git a/cmake/FindGUI.cmake b/cmake/FindGUI.cmake
index 55d2638..5b5b8a7 100644
--- a/cmake/FindGUI.cmake
+++ b/cmake/FindGUI.cmake
@@ -23,44 +23,51 @@
 
 SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome)
 
+# idl
+FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeIDLPVServer SalomeIDLPVServer ${GUI_ROOT_DIR}/lib/salome)
+# src
 FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(GraphicsView GraphicsView ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(ImageComposer ImageComposer ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(OCCViewer OCCViewer ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(OpenGLUtils OpenGLUtils ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PVServerService PVServerService ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PVServerServiceLoader PVServerServiceLoader ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PVViewer PVViewer ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(Plot2d Plot2d ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PyViewer PyViewer ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(QDS QDS ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(QxScene QxScene ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SalomePyQtGUILight SalomePyQtGUILight ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SalomePyQtGUI SalomePyQtGUI ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomePyQt SalomePyQt ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomePy SalomePy ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SOCC SOCC ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SPlot2d SPlot2d ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(std std ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(suit suit ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(ViewerData ViewerData ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview)
-FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(SalomeTreeData SalomeTreeData ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(ViewerData ViewerData ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome)
+# tools
+FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PyEditor PyEditor ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome)