From 4741afe234577c22bcf8447a79baa99d7d5780d8 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 11 Jun 2015 10:20:06 +0300 Subject: [PATCH] Migration to OCCT > 6.9.0 --- salome_adm/cmake_files/FindCAS.cmake | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake index ca815cfc8..7646276a0 100644 --- a/salome_adm/cmake_files/FindCAS.cmake +++ b/salome_adm/cmake_files/FindCAS.cmake @@ -76,17 +76,8 @@ 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,7 +100,9 @@ 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 ) @@ -128,7 +121,6 @@ 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 ) @@ -141,11 +133,6 @@ 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 ) SET(CAS_KERNEL ${CAS_TKernel} ${CAS_TKMath}) SET(CAS_OCAF ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKCDF} ${CAS_TKLCAF}) @@ -194,7 +181,6 @@ SET(_libs CAS_TKMath CAS_TKMesh CAS_TKMeshVS - CAS_TKNIS CAS_TKOffset CAS_TKOpenGl CAS_TKPCAF @@ -227,8 +213,8 @@ 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() INCLUDE(FindPackageHandleStandardArgs) -- 2.39.2