From 3ac12f85b5f1e295010138880ebb5a6faae8e52d Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 25 Sep 2017 12:15:01 +0300
Subject: [PATCH] Clean-up deprecated OCCT-related code + Fix-up required OCCT
 version

---
 cmake/FindSalomeCAS.cmake | 101 +++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 23 deletions(-)

diff --git a/cmake/FindSalomeCAS.cmake b/cmake/FindSalomeCAS.cmake
index 94f9371..928b58a 100755
--- a/cmake/FindSalomeCAS.cmake
+++ b/cmake/FindSalomeCAS.cmake
@@ -25,32 +25,87 @@
 #
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CAS CAS_INCLUDE_DIRS 1)
-MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
-  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    
-  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_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_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)
-  MARK_AS_ADVANCED(CAS_TKStdL)
+SET(OCCT_MINIMUM_VERSION "7.2")
+IF(CAS_VERSION_STR VERSION_LESS ${OCCT_MINIMUM_VERSION})
+  MESSAGE(FATAL_ERROR "SALOME requires Open CASCADE Technology ${OCCT_MINIMUM_VERSION} or newer.")
 ENDIF()
 
-IF(CAS_VERSION_STR VERSION_LESS "7.0")
-  SET(CAS_STDPLUGIN TKStdSchema)
-ELSE()
-  SET(CAS_STDPLUGIN TKStd)
-  SET(CAS_BINPLUGIN TKBin)
-ENDIF()
+MARK_AS_ADVANCED(CAS_INCLUDE_DIRS)
+MARK_AS_ADVANCED(
+  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
+  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_TKStd
+  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
+  CAS_TKXmlTObj
+  CAS_TKXmlXCAF
+  CAS_TKXSBase
+  CAS_XCAFPlugin
+  CAS_XmlLPlugin
+  CAS_XmlPlugin
+  CAS_XmlTObjPlugin
+  CAS_XmlXCAFPlugin
+  CAS_Xmu
+)
+
+SET(CAS_STDPLUGIN TKStd)
+SET(CAS_BINPLUGIN TKBin)
 
 # Workaround: detect and add freetype to CAS_INCLUDE_DIRS
 # It will be suppressed after migration OCCT detection procedure to CONFIG mode
-- 
2.39.2