X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_adm%2Fcmake_files%2FFindCAS.cmake;h=97c182714f925c1646c649bb0eaf94da2c97bbb0;hb=40276fe1f56729b8affec0dc83860220f2fc1271;hp=ca815cfc8713fe717bd3cee9275a78b4b0230e51;hpb=9a965a48d4bc1a6cd1f73229a91e77b10bffa881;p=modules%2Fkernel.git

diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake
index ca815cfc8..97c182714 100644
--- a/salome_adm/cmake_files/FindCAS.cmake
+++ b/salome_adm/cmake_files/FindCAS.cmake
@@ -76,17 +76,7 @@ IF(NOT WIN32)
   ENDIF()
 ENDIF()
 
-#FIND_LIBRARY(CAS_BinLPlugin BinLPlugin )
-#FIND_LIBRARY(CAS_BinPlugin BinPlugin )
-#FIND_LIBRARY(CAS_BinTObjPlugin BinTObjPlugin )
-#FIND_LIBRARY(CAS_BinXCAFPlugin BinXCAFPlugin )
 FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin )
-FIND_LIBRARY(CAS_PTKernel PTKernel )
-#FIND_LIBRARY(CAS_StdLPlugin StdLPlugin )
-#FIND_LIBRARY(CAS_StdPlugin StdPlugin )
-IF(CAS_VERSION_STR VERSION_LESS "6.7.2")
-FIND_LIBRARY(CAS_TKAdvTools TKAdvTools )
-ENDIF()
 FIND_LIBRARY(CAS_TKBin TKBin )
 FIND_LIBRARY(CAS_TKBinL TKBinL )
 FIND_LIBRARY(CAS_TKBinTObj TKBinTObj )
@@ -109,18 +99,14 @@ FIND_LIBRARY(CAS_TKLCAF TKLCAF )
 FIND_LIBRARY(CAS_TKMath TKMath )
 FIND_LIBRARY(CAS_TKMesh TKMesh )
 FIND_LIBRARY(CAS_TKMeshVS TKMeshVS )
-FIND_LIBRARY(CAS_TKNIS TKNIS )
+IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
+  FIND_LIBRARY(CAS_TKNIS TKNIS )
+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 )
@@ -128,11 +114,9 @@ FIND_LIBRARY(CAS_TKSTEPBase TKSTEPBase )
 FIND_LIBRARY(CAS_TKSTL TKSTL )
 FIND_LIBRARY(CAS_TKTObj TKTObj )
 FIND_LIBRARY(CAS_TKTopAlgo TKTopAlgo )
-#FIND_LIBRARY(CAS_TKV2d TKV2d )
 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 )
@@ -141,11 +125,17 @@ FIND_LIBRARY(CAS_TKXmlL TKXmlL )
 FIND_LIBRARY(CAS_TKXmlTObj TKXmlTObj )
 FIND_LIBRARY(CAS_TKXmlXCAF TKXmlXCAF )
 FIND_LIBRARY(CAS_TKXSBase TKXSBase )
-#FIND_LIBRARY(CAS_XCAFPlugin XCAFPlugin )
-#FIND_LIBRARY(CAS_XmlLPlugin XmlLPlugin )
-#FIND_LIBRARY(CAS_XmlPlugin XmlPlugin )
-#FIND_LIBRARY(CAS_XmlTObjPlugin XmlTObjPlugin )
-#FIND_LIBRARY(CAS_XmlXCAFPlugin XmlXCAFPlugin )
+
+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})
@@ -171,7 +161,6 @@ SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
   CAS_FWOSPlugin
-  CAS_PTKernel
   CAS_TKBin
   CAS_TKBinL
   CAS_TKBinTObj
@@ -194,18 +183,11 @@ SET(_libs
   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
@@ -216,7 +198,6 @@ SET(_libs
   CAS_TKV3d
   CAS_TKVRML
   CAS_TKXCAF
-  CAS_TKXCAFSchema
   CAS_TKXDEIGES
   CAS_TKXDESTEP
   CAS_TKXMesh
@@ -227,10 +208,24 @@ SET(_libs
   CAS_TKXSBase
 )
 
-IF(CAS_VERSION_STR VERSION_LESS "6.7.2")
-  LIST(APPEND _libs CAS_TKAdvTools)
+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})