Porting on OCCT7.0.1: persistence

diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake
index ce24f3d589e15e7fdadd2b047cb8c1f24f0f1335..dc46f0c10891a95b7c0d518b676048e7f7acdb5c 100644 (file)
--- a/salome_adm/cmake_files/FindCAS.cmake
+++ b/salome_adm/cmake_files/FindCAS.cmake
@@ -80,7 +80,11 @@ IF(NOT WIN32)
   ENDIF()
 ENDIF()
 
-FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+ELSE()
+  FIND_LIBRARY(CAS_TKStd TKStd PATH_SUFFIXES lib lin64/gcc/lib bin)
+ENDIF()
 FIND_LIBRARY(CAS_TKBin TKBin PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinL TKBinL PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinTObj TKBinTObj PATH_SUFFIXES lib lin64/gcc/lib bin)
@@ -164,7 +168,6 @@ SET(CAS_TKSTL ${CAS_TKSTL_EA})
 SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
-  CAS_FWOSPlugin
   CAS_TKBin
   CAS_TKBinL
   CAS_TKBinTObj
@@ -212,6 +215,12 @@ SET(_libs
   CAS_TKXSBase
 )
 
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  LIST(APPEND _libs CAS_FWOSPlugin)
+ELSE()
+  LIST(APPEND _libs CAS_TKStd)
+ENDIF()
+
 IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
   LIST(APPEND _libs CAS_TKNIS)
 ENDIF()

diff --git a/salome_adm/cmake_files/FindSalomeCAS.cmake b/salome_adm/cmake_files/FindSalomeCAS.cmake
index 186df6cee81429082dbd9e7ff1c34bf66d4625c8..f1c843cd30cc1bdff7ee12e1bbd05b9467fc673a 100755 (executable)
--- a/salome_adm/cmake_files/FindSalomeCAS.cmake
+++ b/salome_adm/cmake_files/FindSalomeCAS.cmake
@@ -26,7 +26,7 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CAS CAS_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
-  CAS_BinLPlugin CAS_BinTObjPlugin   CAS_BinXCAFPlugin CAS_FWOSPlugin CAS_PTKernel
+  CAS_BinLPlugin CAS_BinTObjPlugin   CAS_BinXCAFPlugin CAS_PTKernel
   CAS_StdLPlugin CAS_StdPlugin CAS_TKAdvTools  CAS_TKBin   CAS_TKBinL    CAS_TKBinTObj   
   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    
@@ -38,12 +38,17 @@ MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
   CAS_TKXmlXCAF   CAS_TKXSBase    CAS_XCAFPlugin    CAS_XmlLPlugin    CAS_XmlPlugin   CAS_XmlTObjPlugin   
   CAS_XmlXCAFPlugin CAS_Xmu)
 
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  MARK_AS_ADVANCED(CAS_FWOSPlugin)
+ELSE()
+  MARK_AS_ADVANCED(CAS_TKStd)
+ENDIF()
 
 IF(CAS_VERSION_STR VERSION_LESS "7.0")
   SET(CAS_STDPLUGIN TKStdSchema)
 ELSE()
   SET(CAS_STDPLUGIN TKStd)
-  SET(CAS_BINPLUGIN TKBin)\r
+  SET(CAS_BINPLUGIN TKBin)
 ENDIF()
 
 IF(CAS_FOUND)