From: vsr <vsr@opencascade.com>
Date: Thu, 11 Jun 2015 13:46:14 +0000 (+0300)
Subject: Migration to OCCT 7x
X-Git-Tag: V7_7_0a1~29
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5a1936dced45502005a810442d899a2b4f6e722b;p=modules%2Fkernel.git

Migration to OCCT 7x
---

diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake
index 7646276a0..97c182714 100644
--- a/salome_adm/cmake_files/FindCAS.cmake
+++ b/salome_adm/cmake_files/FindCAS.cmake
@@ -77,7 +77,6 @@ IF(NOT WIN32)
 ENDIF()
 
 FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin )
-FIND_LIBRARY(CAS_PTKernel PTKernel )
 FIND_LIBRARY(CAS_TKBin TKBin )
 FIND_LIBRARY(CAS_TKBinL TKBinL )
 FIND_LIBRARY(CAS_TKBinTObj TKBinTObj )
@@ -105,15 +104,9 @@ IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
 ENDIF()
 FIND_LIBRARY(CAS_TKOffset TKOffset )
 FIND_LIBRARY(CAS_TKOpenGl TKOpenGl )
-FIND_LIBRARY(CAS_TKPCAF TKPCAF )
-FIND_LIBRARY(CAS_TKPLCAF TKPLCAF )
 FIND_LIBRARY(CAS_TKPrim TKPrim )
-FIND_LIBRARY(CAS_TKPShape TKPShape )
 FIND_LIBRARY(CAS_TKService TKService )
-FIND_LIBRARY(CAS_TKShapeSchema TKShapeSchema )
 FIND_LIBRARY(CAS_TKShHealing TKShHealing )
-FIND_LIBRARY(CAS_TKStdLSchema TKStdLSchema )
-FIND_LIBRARY(CAS_TKStdSchema TKStdSchema )
 FIND_LIBRARY(CAS_TKSTEP TKSTEP )
 FIND_LIBRARY(CAS_TKSTEP209 TKSTEP209 )
 FIND_LIBRARY(CAS_TKSTEPAttr TKSTEPAttr )
@@ -124,7 +117,6 @@ FIND_LIBRARY(CAS_TKTopAlgo TKTopAlgo )
 FIND_LIBRARY(CAS_TKV3d TKV3d )
 FIND_LIBRARY(CAS_TKVRML TKVRML )
 FIND_LIBRARY(CAS_TKXCAF TKXCAF )
-FIND_LIBRARY(CAS_TKXCAFSchema TKXCAFSchema )
 FIND_LIBRARY(CAS_TKXDEIGES TKXDEIGES )
 FIND_LIBRARY(CAS_TKXDESTEP TKXDESTEP )
 FIND_LIBRARY(CAS_TKXMesh TKXMesh )
@@ -134,6 +126,17 @@ FIND_LIBRARY(CAS_TKXmlTObj TKXmlTObj )
 FIND_LIBRARY(CAS_TKXmlXCAF TKXmlXCAF )
 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})
 SET(CAS_OCAF ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKCDF} ${CAS_TKLCAF})
 SET(CAS_VIEWER ${CAS_TKService} ${CAS_TKV3d} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKBRep})
@@ -158,7 +161,6 @@ SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
   CAS_FWOSPlugin
-  CAS_PTKernel
   CAS_TKBin
   CAS_TKBinL
   CAS_TKBinTObj
@@ -183,15 +185,9 @@ SET(_libs
   CAS_TKMeshVS
   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
@@ -202,7 +198,6 @@ SET(_libs
   CAS_TKV3d
   CAS_TKVRML
   CAS_TKXCAF
-  CAS_TKXCAFSchema
   CAS_TKXDEIGES
   CAS_TKXDESTEP
   CAS_TKXMesh
@@ -217,6 +212,20 @@ IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
   LIST(APPEND _libs CAS_TKNIS)
 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()
+
+
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CAS REQUIRED_VARS CAS_INCLUDE_DIRS ${_libs})