*** empty log message ***

diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake
index 5e15bdb3616d1bd5ed6ce0536cd8bdefd9257365..8490c7c66f69cca0762776ee881ff7c546adf900 100644 (file)
--- a/adm_local/cmake_files/FindCAS.cmake
+++ b/adm_local/cmake_files/FindCAS.cmake
@@ -42,117 +42,119 @@ ELSE(WINDOWS)
   SET(CASROOT_LIBDIR ${CASROOT}/lib)
 ENDIF(WINDOWS)
 
-FIND_LIBRARY(TKernel TKernel PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKMath TKMath PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKV3d TKV3d PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKCDF TKCDF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKLCAF TKLCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKService TKService PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(BinLPlugin BinLPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(BinPlugin BinPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(BinTObjPlugin BinTObjPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(FWOSPlugin FWOSPlugin PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(mscmd mscmd PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(PTKernel PTKernel PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(StdLPlugin StdLPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(StdPlugin StdPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKAdvTools TKAdvTools PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBin TKBin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBinL TKBinL PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBinTObj TKBinTObj PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBinXCAF TKBinXCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBO TKBO PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKBool TKBool PATHS ${CASROOT_LIBDIR})
 FIND_LIBRARY(TKBRep TKBRep PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKGeomBase TKGeomBase PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKOpenGl TKOpenGl PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKCAF TKCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKCDF TKCDF PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCDLFront TKCDLFront PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCPPClient TKCPPClient PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCPPExt TKCPPExt PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCPPIntExt TKCPPIntExt PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCPPJini TKCPPJini PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKDCAF TKDCAF PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKDraw TKDraw PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKernel TKernel PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKFeat TKFeat PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKFillet TKFillet PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKG2d TKG2d PATHS ${CASROOT_LIBDIR})
 FIND_LIBRARY(TKG3d TKG3d PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBool TKBool PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKGeomAlgo TKGeomAlgo PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKGeomBase TKGeomBase PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKHLR TKHLR PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKIDLFront TKIDLFront PATHS ${CASROOT_LIBDIR})
 FIND_LIBRARY(TKIGES TKIGES PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKLCAF TKLCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKMath TKMath PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKMesh TKMesh PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKMeshVS TKMeshVS PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKNIS TKNIS PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKOffset TKOffset PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKOpenGl TKOpenGl PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKPCAF TKPCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKPLCAF TKPLCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKPrim TKPrim PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKPShape TKPShape PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKService TKService PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKShapeSchema TKShapeSchema PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKShHealing TKShHealing PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKStdLSchema TKStdLSchema PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKStdSchema TKStdSchema PATHS ${CASROOT_LIBDIR})
 FIND_LIBRARY(TKSTEP TKSTEP PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKSTEP209 TKSTEP209 PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKSTEPAttr TKSTEPAttr PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKSTEPBase TKSTEPBase PATHS ${CASROOT_LIBDIR})
 FIND_LIBRARY(TKSTL TKSTL PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKCAF TKCAF PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKTCPPExt TKTCPPExt PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKTObj TKTObj PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKTObjDRAW TKTObjDRAW PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKTopAlgo TKTopAlgo PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKTopTest TKTopTest PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKV2d TKV2d PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKV3d TKV3d PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKViewerTest TKViewerTest PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKVRML TKVRML PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKWOK TKWOK PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKWOKTcl TKWOKTcl PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXCAF TKXCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXCAFSchema TKXCAFSchema PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKXDEDRAW TKXDEDRAW PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXDEIGES TKXDEIGES PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXDESTEP TKXDESTEP PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXMesh TKXMesh PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXml TKXml PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXmlL TKXmlL PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXmlTObj TKXmlTObj PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXmlXCAF TKXmlXCAF PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(TKXSBase TKXSBase PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(TKXSDRAW TKXSDRAW PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokcmd wokcmd PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokdeliverysteps wokdeliverysteps PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokdfltsteps wokdfltsteps PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokobjssteps wokobjssteps PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokorbixsteps wokorbixsteps PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(woksteps woksteps PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(woktoolscmd woktoolscmd PATHS ${CASROOT_LIBDIR})
+# FIND_LIBRARY(wokutilscmd wokutilscmd PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(XCAFPlugin XCAFPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(XmlLPlugin XmlLPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(XmlPlugin XmlPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(XmlTObjPlugin XmlTObjPlugin PATHS ${CASROOT_LIBDIR})
+FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin PATHS ${CASROOT_LIBDIR})
 
 SET(CAS_KERNEL ${TKernel} ${TKMath})
-SET(CAS_OCAF ${TKernel} ${TKCDF} ${TKLCAF})
+SET(CAS_OCAF ${TKernel} ${TKMath} ${TKCDF} ${TKLCAF})
 SET(CAS_VIEWER ${TKService} ${TKV3d} ${TKG3d} ${TKGeomBase} ${TKBRep})
-SET(CAS_OCAFVIS ${TKCAF})
-
-SET(TKV3d ${TKernel} ${TKMath} ${TKV3d})
+SET(CAS_OCAFVIS ${TKCAF} ${TKBRep} ${TKG2d})
+SET(CAS_MODELER ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKBRep} ${TKTopAlgo} ${TKG2d})
 
+SET(TKV3d_EA ${TKernel} ${TKMath} ${TKV3d})
+SET(TKBool_EA ${TKernel} ${TKMath} ${TKBRep} ${TKG2d} ${TKG3d} ${TKGeomBase} ${TKGeomAlgo} ${TKTopAlgo} ${TKBool})
+SET(TKBRep_EA ${TKernel} ${TKMath} ${TKBRep})
+SET(TKIGES_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKIGES})
+SET(TKSTEP_EA ${TKernel} ${TKMath} ${TKXSBase} ${TKBRep} ${TKSTEP})
+SET(TKSTL_EA ${TKernel} ${TKMath} ${TKSTL})
+SET(TKCAF_EA ${TKPrim} ${TKCAF})
 
-# ${StdPlugin} ${StdLPlugin} ${TKPLCAF} ${TKPShape} ${TKStdLSchema} ${TKShapeSchema}) # From check_cas .m4
-#SET(CAS_VIEWER ${TKService}) # From check_cas .m4
-#SET(CAS_VIEWER ${CAS_VIEWER} ${CAS_TKV3d} ${CAS_TKBRep}) # Add-ons E.A.
-#SET(CAS_CXXFLAGS)
-#FIND_LIBRARY(BinLPlugin BinLPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(BinPlugin BinPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(FWOSPlugin FWOSPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(mscmd mscmd PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(PTKernel PTKernel PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(StdLPlugin StdLPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(StdPlugin StdPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKAdvTools TKAdvTools PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKBinL TKBinL PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKBin TKBin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKBinXCAF TKBinXCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKBO TKBO PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCDLFront TKCDLFront PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCPPClient TKCPPClient PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCPPExt TKCPPExt PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCPPIntExt TKCPPIntExt PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCPPJini TKCPPJini PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKDCAF TKDCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKDraw TKDraw PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKFeat TKFeat PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKFillet TKFillet PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKG2d TKG2d PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKGeomAlgo TKGeomAlgo PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKHLR TKHLR PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKIDLFront TKIDLFront PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKMesh TKMesh PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKMeshVS TKMeshVS PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKOffset TKOffset PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKPCAF TKPCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKPLCAF TKPLCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKPrim TKPrim PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKPShape TKPShape PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKShapeSchema TKShapeSchema PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKShHealing TKShHealing PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKStdLSchema TKStdLSchema PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKStdSchema TKStdSchema PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKSTEP209 TKSTEP209 PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKSTEPAttr TKSTEPAttr PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKSTEPBase TKSTEPBase PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKTCPPExt TKTCPPExt PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKTopAlgo TKTopAlgo PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKTopTest TKTopTest PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKV2d TKV2d PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKViewerTest TKViewerTest PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKVRML TKVRML PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKWOK TKWOK PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKWOKTcl TKWOKTcl PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXCAFSchema TKXCAFSchema PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXCAF TKXCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXDEDRAW TKXDEDRAW PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXDEIGES TKXDEIGES PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXDESTEP TKXDESTEP PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXmlL TKXmlL PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXml TKXml PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXmlXCAF TKXmlXCAF PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXSBase TKXSBase PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(TKXSDRAW TKXSDRAW PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokcmd wokcmd PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokdeliverysteps wokdeliverysteps PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokdfltsteps wokdfltsteps PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokobjssteps wokobjssteps PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokorbixsteps wokorbixsteps PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(woksteps woksteps PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(woktoolscmd woktoolscmd PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(wokutilscmd wokutilscmd PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(XCAFPlugin XCAFPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(XmlLPlugin XmlLPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(XmlPlugin XmlPlugin PATHS ${CASROOT_LIBDIR})
-#FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin PATHS ${CASROOT_LIBDIR})
-#SET(CAS_MATH ${TKMath}) # From check_cas .m4
-#SET(CAS_MATH ${CAS_MATH} ${CAS_KERNEL}) # Add-ons E.A.
-#SET(CAS_STDPLUGIN ${StdPlugin}) # From check_cas .m4
-#SET(CAS_TKBRep ${TKG2d} ${TKG3d} ${TKGeomBase} ${TKBRep}) # From check_cas .m4
-#SET(CAS_OCAF ${PTKernel} ${TKernel} ${TKCDF} ${TKLCAF} ${TKPCAF} ${TKStdSchema}) # From check_cas .m4
-#SET(CAS_OCAFVIS ${TKCAF} ${StdPlugin} ${StdLPlugin} ${TKPLCAF} ${TKPShape} ${TKStdLSchema} ${TKShapeSchema}) # From check_cas .m4
-#SET(CAS_OCAFVIS ${CAS_OCAFVIS} ${CAS_TKBRep} ${CAS_MATH}) # Add-ons E.A.
-#SET(CAS_TKV3d ${TKV3d}) # From check_cas .m4
-#SET(CAS_TKV3d ${CAS_TKV3d} ${CAS_KERNEL} ${CAS_MATH}) # Add-ons E.A.
-#SET(CAS_TKTopAlgo ${CAS_TKBRep} ${TKGeomAlgo} ${TKTopAlgo}) # From check_cas .m4
-#SET(CAS_TKPrim ${CAS_TKTopAlgo} ${TKPrim}) # From check_cas .m4
-#SET(CAS_MODELER ${CAS_TKPrim} ${TKBO} ${TKBool} ${TKHLR} ${TKFillet} ${TKOffset} ${TKFeat}) # From check_cas .m4
-#SET(CAS_MODELER ${CAS_MODELER} ${CAS_MATH}) # Add-ons E.A.
-#SET(CAS_DATAEXCHANGE ${CAS_LDPATH} ${TKIGES} ${TKSTEP}) # From check_cas .m4
-#SET(CAS_LDFLAGS ${CAS_KERNEL} ${CAS_MATH} ${CAS_OCAF} ${CAS_OCAFVIS} ${CAS_VIEWER} ${CAS_MODELER} ${CAS_DATAEXCHANGE})
+SET(TKV3d ${TKV3d_EA})
+SET(TKBool ${TKBool_EA})
+SET(TKBRep ${TKBRep_EA})
+SET(TKIGES ${TKIGES_EA})
+SET(TKSTEP ${TKSTEP_EA})
+SET(TKSTL ${TKSTL_EA})
+SET(TKCAF ${TKCAF_EA})

diff --git a/adm_local/cmake_files/FindGUI.cmake b/adm_local/cmake_files/FindGUI.cmake
index dc98934eaef2d518cae0cfb949ccc4a710c87148..14ca37915f461a1610c971dc146e6547c6dc3b6b 100644 (file)
--- a/adm_local/cmake_files/FindGUI.cmake
+++ b/adm_local/cmake_files/FindGUI.cmake
@@ -22,7 +22,34 @@
 
 SET(GUI_CXXFLAGS -I${GUI_ROOT_DIR}/include/salome)
 
+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(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(OCCViewer OCCViewer ${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(QDS QDS ${GUI_ROOT_DIR}/lib/salome)
 FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome)
-FIND_LIBRARY(suit suit ${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(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(SUPERVGraph SUPERVGraph ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome)

diff --git a/build_cmake.bat b/build_cmake.bat
new file mode 100644 (file)
index 0000000..58a10b0
--- /dev/null
+++ b/build_cmake.bat
@@ -0,0 +1,2 @@
+\r
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --gui\r