Porting to OCCT 7.8.0

diff --git a/cmake/FindCAS.cmake b/cmake/FindCAS.cmake
index 42d00a6002ea69e3972c55a4d8a98a226575d44e..789504f5be0c9d8b1451b65d46237d4420fc183d 100644 (file)
--- a/cmake/FindCAS.cmake
+++ b/cmake/FindCAS.cmake
@@ -106,7 +106,6 @@ FIND_LIBRARY(CAS_TKG3d TKG3d PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKGeomAlgo TKGeomAlgo PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKGeomBase TKGeomBase PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKHLR TKHLR PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKIGES TKIGES PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKLCAF TKLCAF PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKMath TKMath PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKMesh TKMesh PATH_SUFFIXES lib lin64/gcc/lib bin)
@@ -119,18 +118,26 @@ FIND_LIBRARY(CAS_TKOpenGl TKOpenGl PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKPrim TKPrim PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKService TKService PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKShHealing TKShHealing PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKSTEP TKSTEP PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKSTEP209 TKSTEP209 PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKSTEPAttr TKSTEPAttr PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKSTEPBase TKSTEPBase PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKSTL TKSTL PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKTObj TKTObj PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKTopAlgo TKTopAlgo PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKV3d TKV3d PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKVRML TKVRML PATH_SUFFIXES lib lin64/gcc/lib bin)
+IF(CAS_VERSION_STR VERSION_LESS "7.8.0")
+  FIND_LIBRARY(CAS_TKIGES TKIGES PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKSTEP TKSTEP PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKSTEP209 TKSTEP209 PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKSTEPAttr TKSTEPAttr PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKSTEPBase TKSTEPBase PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKSTL TKSTL PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKVRML TKVRML PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKXDEIGES TKXDEIGES PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKXDESTEP TKXDESTEP PATH_SUFFIXES lib lin64/gcc/lib bin)
+ELSE()
+  FIND_LIBRARY(CAS_TKDEIGES TKDEIGES PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKDESTEP TKDESTEP PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKDESTL  TKDESTL  PATH_SUFFIXES lib lin64/gcc/lib bin)
+  FIND_LIBRARY(CAS_TKDEVRML TKDEVRML PATH_SUFFIXES lib lin64/gcc/lib bin)
+ENDIF()
 FIND_LIBRARY(CAS_TKXCAF TKXCAF PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKXDEIGES TKXDEIGES PATH_SUFFIXES lib lin64/gcc/lib bin)
-FIND_LIBRARY(CAS_TKXDESTEP TKXDESTEP PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKXMesh TKXMesh PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKXml TKXml PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKXmlL TKXmlL PATH_SUFFIXES lib lin64/gcc/lib bin)
@@ -158,17 +165,27 @@ SET(CAS_MODELER ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKBRep} $
 SET(CAS_TKV3d_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKV3d})
 SET(CAS_TKBool_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKBRep} ${CAS_TKG2d} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKTopAlgo} ${CAS_TKBool})
 SET(CAS_TKBRep_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKBRep})
-SET(CAS_TKIGES_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKIGES})
-SET(CAS_TKSTEP_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKSTEP})
-SET(CAS_TKSTL_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKSTL})
 SET(CAS_TKCAF_EA ${CAS_TKPrim} ${CAS_TKCAF})
 
+IF(CAS_VERSION_STR VERSION_LESS "7.8.0")
+  SET(CAS_TKIGES_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKIGES})
+  SET(CAS_TKSTEP_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKSTEP})
+  SET(CAS_TKSTL_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKSTL})
+  SET(CAS_TKIGES ${CAS_TKIGES_EA})
+  SET(CAS_TKSTEP ${CAS_TKSTEP_EA})
+  SET(CAS_TKSTL ${CAS_TKSTL_EA})
+ELSE()
+  SET(CAS_TKDEIGES_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKDEIGES})
+  SET(CAS_TKDESTEP_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKXSBase} ${CAS_TKBRep} ${CAS_TKDESTEP})
+  SET(CAS_TKDESTL_EA  ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKDESTL})
+  SET(CAS_TKDEIGES ${CAS_TKDEIGES_EA})
+  SET(CAS_TKDESTEP ${CAS_TKDESTEP_EA})
+  SET(CAS_TKDESTL  ${CAS_TKDESTL_EA})
+ENDIF()
+
 SET(CAS_TKV3d ${CAS_TKV3d_EA})
 SET(CAS_TKBool ${CAS_TKBool_EA})
 SET(CAS_TKBRep ${CAS_TKBRep_EA})
-SET(CAS_TKIGES ${CAS_TKIGES_EA})
-SET(CAS_TKSTEP ${CAS_TKSTEP_EA})
-SET(CAS_TKSTL ${CAS_TKSTL_EA})
 SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
@@ -189,7 +206,6 @@ SET(_libs
   CAS_TKGeomAlgo
   CAS_TKGeomBase
   CAS_TKHLR
-  CAS_TKIGES
   CAS_TKLCAF
   CAS_TKMath
   CAS_TKMesh
@@ -199,25 +215,37 @@ SET(_libs
   CAS_TKPrim
   CAS_TKService
   CAS_TKShHealing
-  CAS_TKSTEP
-  CAS_TKSTEP209
-  CAS_TKSTEPAttr
-  CAS_TKSTEPBase
-  CAS_TKSTL
-  CAS_TKTObj
   CAS_TKTopAlgo
   CAS_TKV3d
-  CAS_TKVRML
   CAS_TKXCAF
-  CAS_TKXDEIGES
-  CAS_TKXDESTEP
   CAS_TKXMesh
   CAS_TKXml
   CAS_TKXmlL
   CAS_TKXmlTObj
   CAS_TKXmlXCAF
   CAS_TKXSBase
-)
+  CAS_TKTObj
+  )
+IF(CAS_VERSION_STR VERSION_LESS "7.8.0")
+  LIST(APPEND _libs
+    CAS_TKIGES
+    CAS_TKSTEP
+    CAS_TKSTEP209
+    CAS_TKSTEPAttr
+    CAS_TKSTEPBase
+    CAS_TKSTL
+    CAS_TKVRML
+    CAS_TKXDEIGES
+    CAS_TKXDESTEP
+    )
+ELSE()
+  LIST(APPEND _libs
+    CAS_TKDEIGES
+    CAS_TKDESTEP
+    CAS_TKDESTL
+    CAS_TKDEVRML
+    )
+ENDIF()
 
 IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
   LIST(APPEND _libs CAS_FWOSPlugin)

diff --git a/cmake/FindSalomeCAS.cmake b/cmake/FindSalomeCAS.cmake
index aabb1dbfe13aac11a1c23bbf73be331656e8d25a..0d5cf45f6bcf454bee953dbe0a6dd5649e058008 100644 (file)
--- a/cmake/FindSalomeCAS.cmake
+++ b/cmake/FindSalomeCAS.cmake
@@ -57,7 +57,6 @@ MARK_AS_ADVANCED(
   CAS_TKGeomAlgo
   CAS_TKGeomBase
   CAS_TKHLR
-  CAS_TKIGES
   CAS_TKLCAF
   CAS_TKMath
   CAS_TKMesh
@@ -76,20 +75,12 @@ MARK_AS_ADVANCED(
   CAS_TKStdL
   CAS_TKStdLSchema
   CAS_TKStdSchema
-  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
@@ -104,6 +95,29 @@ MARK_AS_ADVANCED(
   CAS_Xmu
 )
 
+SET(OCCT_VERSION_780 "7.8.0")
+IF(CAS_VERSION_STR VERSION_LESS ${OCCT_VERSION_780})
+  MARK_AS_ADVANCED(
+    CAS_TKIGES
+    CAS_TKXDEIGES
+    CAS_TKXDESTEP
+    CAS_TKSTEP
+    CAS_TKSTEP209
+    CAS_TKSTEPAttr
+    CAS_TKSTEPBase
+    CAS_TKSTL
+    CAS_TKVRML
+  )
+ELSE()
+  MARK_AS_ADVANCED(
+    CAS_TKDEIGES
+    CAS_TKDESTEP
+    CAS_TKDESTL
+    CAS_TKDEOBJ
+    CAS_TKDEVRML
+  )
+ENDIF()
+
 SET(CAS_STDPLUGIN TKStd)
 SET(CAS_BINPLUGIN TKBin)