Import the both of old and new HDF

diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake
index 97c182714f925c1646c649bb0eaf94da2c97bbb0..3992f1418e05ddea25af53800e31b11205f07c57 100644 (file)
--- a/salome_adm/cmake_files/FindCAS.cmake
+++ b/salome_adm/cmake_files/FindCAS.cmake
@@ -128,13 +128,6 @@ FIND_LIBRARY(CAS_TKXSBase TKXSBase )
 
 IF(CAS_VERSION_STR VERSION_LESS "7.0")
   FIND_LIBRARY(CAS_PTKernel PTKernel )
-  FIND_LIBRARY(CAS_TKPCAF TKPCAF )
-  FIND_LIBRARY(CAS_TKPLCAF TKPLCAF )
-  FIND_LIBRARY(CAS_TKPShape TKPShape )
-  FIND_LIBRARY(CAS_TKShapeSchema TKShapeSchema )
-  FIND_LIBRARY(CAS_TKStdLSchema TKStdLSchema )
-  FIND_LIBRARY(CAS_TKStdSchema TKStdSchema )
-  FIND_LIBRARY(CAS_TKXCAFSchema TKXCAFSchema )
 ENDIF()
 
 SET(CAS_KERNEL ${CAS_TKernel} ${CAS_TKMath})
@@ -215,13 +208,6 @@ ENDIF()
 IF(CAS_VERSION_STR VERSION_LESS "7.0")
   LIST(APPEND _libs
     CAS_PTKernel
-    CAS_TKPCAF
-    CAS_TKPLCAF
-    CAS_TKPShape
-    CAS_TKShapeSchema
-    CAS_TKStdLSchema
-    CAS_TKStdSchema
-    CAS_TKXCAFSchema
     )
 ENDIF()
 

diff --git a/salome_adm/cmake_files/FindSalomeCAS.cmake b/salome_adm/cmake_files/FindSalomeCAS.cmake
index 7760ee94cc636cbed0b6d333c249a15930b719bf..ec51fc3c2cd365652a8a5e1dae29001e1c4b5a87 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeCAS.cmake
+++ b/salome_adm/cmake_files/FindSalomeCAS.cmake
@@ -31,20 +31,15 @@ MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
   CAS_TKBinXCAF   CAS_TKBO    CAS_TKBool    CAS_TKBRep    CAS_TKCAF   CAS_TKCDF   CAS_TKernel   
   CAS_TKFeat    CAS_TKFillet    CAS_TKG2d   CAS_TKG3d   CAS_TKGeomAlgo    CAS_TKGeomBase    
   CAS_TKHLR   CAS_TKIGES    CAS_TKLCAF    CAS_TKMath    CAS_TKMesh    CAS_TKMeshVS    CAS_TKNIS   
-  CAS_TKOffset    CAS_TKOpenGl    CAS_TKPCAF    CAS_TKPLCAF   CAS_TKPrim    CAS_TKPShape    CAS_TKService   
-  CAS_TKShapeSchema   CAS_TKShHealing   CAS_TKStdLSchema    CAS_TKStdSchema   CAS_TKSTEP    CAS_TKSTEP209   
+  CAS_TKOffset    CAS_TKOpenGl    CAS_TKPrim    CAS_TKService   
+  CAS_TKShHealing   CAS_TKSTEP    CAS_TKSTEP209   
   CAS_TKSTEPAttr    CAS_TKSTEPBase    CAS_TKSTL   CAS_TKTObj    CAS_TKTopAlgo   CAS_TKV2d   CAS_TKV3d   CAS_TKVRML    
-  CAS_TKXCAF    CAS_TKXCAFSchema    CAS_TKXDEIGES   CAS_TKXDESTEP   CAS_TKXMesh   CAS_TKXml   CAS_TKXmlL    CAS_TKXmlTObj   
+  CAS_TKXCAF    CAS_TKXDEIGES   CAS_TKXDESTEP   CAS_TKXMesh   CAS_TKXml   CAS_TKXmlL    CAS_TKXmlTObj   
   CAS_TKXmlXCAF   CAS_TKXSBase    CAS_XCAFPlugin    CAS_XmlLPlugin    CAS_XmlPlugin   CAS_XmlTObjPlugin   
   CAS_XmlXCAFPlugin CAS_Xmu)
 
-IF(CAS_StdLPlugin)
-  SET(CAS_STDPLUGIN StdPlugin)
-ELSE()
-  IF(CAS_TKStdSchema)
-    SET(CAS_STDPLUGIN TKStdSchema)
-  ENDIF()
-ENDIF()
+SET(CAS_STDPLUGIN TKStdSchema)
+SET(CAS_BINPLUGIN TKBin)
 
 IF(CAS_FOUND)
   SALOME_ACCUMULATE_HEADERS(CAS_INCLUDE_DIRS)

diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py
index 9b00f75299b3260d9591facc84a6f1b1c4d60f63..b0cdb99429873049ebb3ed28128e28db4ed55521 100644 (file)
--- a/salome_adm/cmake_files/deprecated/am2cmake.py
+++ b/salome_adm/cmake_files/deprecated/am2cmake.py
@@ -169,15 +169,9 @@ class CMakeFile(object):
             "TKNIS",
             "TKOffset",
             "TKOpenGl",
-            "TKPCAF",
-            "TKPLCAF",
             "TKPrim",
-            "TKPShape",
             "TKService",
-            "TKShapeSchema",
             "TKShHealing",
-            "TKStdLSchema",
-            "TKStdSchema",
             "TKSTEP",
             "TKSTEP209",
             "TKSTEPAttr",
@@ -189,7 +183,6 @@ class CMakeFile(object):
             "TKV3d",
             "TKVRML",
             "TKXCAF",
-            "TKXCAFSchema",
             "TKXDEIGES",
             "TKXDESTEP",
             "TKXMesh",

diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4
index c4ffbb4561f0c35fa40f9e51c64301276c5a706f..ef2f75df3b7afd9c9bb05749bd3efd4f447e498e 100644 (file)
--- a/salome_adm/unix/config_files/check_cas.m4
+++ b/salome_adm/unix/config_files/check_cas.m4
@@ -244,19 +244,9 @@ else
   CAS_KERNEL="$CAS_LDPATH -lTKernel"
   CAS_MATH="$CAS_LDPATH -lTKMath"
 
-  CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKernel -lTKCDF -lTKLCAF -lTKPCAF -lTKStdSchema"
-  CAS_OCAFVIS="$CAS_LDPATH -lTKCAF -lTKPLCAF -lTKPShape -lTKStdLSchema -lTKShapeSchema"
-
-  if test -f ${CAS_LIBDIR}/libStdPlugin.so ; then
-    # standard plugin library libStdPlugin has been added in CASCADE 5.2.3
-    CAS_STDPLUGIN="StdPlugin"
-    CAS_OCAFVIS="$CAS_OCAFVIS -lStdPlugin -lStdLPlugin"
-  elif test -f ${CAS_LIBDIR}/libTKStdSchema.so ; then
-    # standard plugin has been renamed in CASCADE 6.5
-    CAS_STDPLUGIN=TKStdSchema
-    CAS_OCAFVIS="$CAS_OCAFVIS -lTKStdSchema -lTKStdLSchema"
-  fi
-  
+  CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKernel -lTKCDF -lTKLCAF"
+  CAS_OCAFVIS="$CAS_LDPATH -lTKCAF"
+
   CAS_TKV3d="$CAS_LDPATH -lTKV3d"
   CAS_VIEWER="$CAS_TKV3d -lTKService"