From d5da18620519b5f1e6a2d5967896910d6c87f16d Mon Sep 17 00:00:00 2001 From: mnt Date: Tue, 1 Mar 2016 18:31:04 +0300 Subject: [PATCH] OCCT 7.0.0 porting - Additional check for OCCT 7.0 non-standard packaging --- salome_adm/cmake_files/FindCAS.cmake | 110 +++++++++++++-------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake index 3e9ac7588..c3115d295 100644 --- a/salome_adm/cmake_files/FindCAS.cmake +++ b/salome_adm/cmake_files/FindCAS.cmake @@ -74,65 +74,65 @@ IF(NOT WIN32) ENDIF() ENDIF() -FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin ) -FIND_LIBRARY(CAS_TKBin TKBin ) -FIND_LIBRARY(CAS_TKBinL TKBinL ) -FIND_LIBRARY(CAS_TKBinTObj TKBinTObj ) -FIND_LIBRARY(CAS_TKBinXCAF TKBinXCAF ) -FIND_LIBRARY(CAS_TKBO TKBO ) -FIND_LIBRARY(CAS_TKBool TKBool ) -FIND_LIBRARY(CAS_TKBRep TKBRep ) -FIND_LIBRARY(CAS_TKCAF TKCAF ) -FIND_LIBRARY(CAS_TKCDF TKCDF ) -FIND_LIBRARY(CAS_TKernel TKernel ) -FIND_LIBRARY(CAS_TKFeat TKFeat ) -FIND_LIBRARY(CAS_TKFillet TKFillet ) -FIND_LIBRARY(CAS_TKG2d TKG2d ) -FIND_LIBRARY(CAS_TKG3d TKG3d ) -FIND_LIBRARY(CAS_TKGeomAlgo TKGeomAlgo ) -FIND_LIBRARY(CAS_TKGeomBase TKGeomBase ) -FIND_LIBRARY(CAS_TKHLR TKHLR ) -FIND_LIBRARY(CAS_TKIGES TKIGES ) -FIND_LIBRARY(CAS_TKLCAF TKLCAF ) -FIND_LIBRARY(CAS_TKMath TKMath ) -FIND_LIBRARY(CAS_TKMesh TKMesh ) -FIND_LIBRARY(CAS_TKMeshVS TKMeshVS ) +FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBin TKBin PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBinL TKBinL PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBinTObj TKBinTObj PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBinXCAF TKBinXCAF PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBO TKBO PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBool TKBool PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKBRep TKBRep PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKCAF TKCAF PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKCDF TKCDF PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKernel TKernel PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKFeat TKFeat PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKFillet TKFillet PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKG2d TKG2d PATH_SUFFIXES lib lin64/gcc/lib bin) +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) +FIND_LIBRARY(CAS_TKMeshVS TKMeshVS PATH_SUFFIXES lib lin64/gcc/lib bin) IF(CAS_VERSION_STR VERSION_LESS "6.9.1") - FIND_LIBRARY(CAS_TKNIS TKNIS ) + FIND_LIBRARY(CAS_TKNIS TKNIS PATH_SUFFIXES lib lin64/gcc/lib bin) ENDIF() -FIND_LIBRARY(CAS_TKOffset TKOffset ) -FIND_LIBRARY(CAS_TKOpenGl TKOpenGl ) -FIND_LIBRARY(CAS_TKPrim TKPrim ) -FIND_LIBRARY(CAS_TKService TKService ) -FIND_LIBRARY(CAS_TKShHealing TKShHealing ) -FIND_LIBRARY(CAS_TKSTEP TKSTEP ) -FIND_LIBRARY(CAS_TKSTEP209 TKSTEP209 ) -FIND_LIBRARY(CAS_TKSTEPAttr TKSTEPAttr ) -FIND_LIBRARY(CAS_TKSTEPBase TKSTEPBase ) -FIND_LIBRARY(CAS_TKSTL TKSTL ) -FIND_LIBRARY(CAS_TKTObj TKTObj ) -FIND_LIBRARY(CAS_TKTopAlgo TKTopAlgo ) -FIND_LIBRARY(CAS_TKV3d TKV3d ) -FIND_LIBRARY(CAS_TKVRML TKVRML ) -FIND_LIBRARY(CAS_TKXCAF TKXCAF ) -FIND_LIBRARY(CAS_TKXDEIGES TKXDEIGES ) -FIND_LIBRARY(CAS_TKXDESTEP TKXDESTEP ) -FIND_LIBRARY(CAS_TKXMesh TKXMesh ) -FIND_LIBRARY(CAS_TKXml TKXml ) -FIND_LIBRARY(CAS_TKXmlL TKXmlL ) -FIND_LIBRARY(CAS_TKXmlTObj TKXmlTObj ) -FIND_LIBRARY(CAS_TKXmlXCAF TKXmlXCAF ) -FIND_LIBRARY(CAS_TKXSBase TKXSBase ) +FIND_LIBRARY(CAS_TKOffset TKOffset PATH_SUFFIXES lib lin64/gcc/lib bin) +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) +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) +FIND_LIBRARY(CAS_TKXmlTObj TKXmlTObj PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKXmlXCAF TKXmlXCAF PATH_SUFFIXES lib lin64/gcc/lib bin) +FIND_LIBRARY(CAS_TKXSBase TKXSBase PATH_SUFFIXES lib lin64/gcc/lib bin) 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 ) + FIND_LIBRARY(CAS_PTKernel PTKernel PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKPCAF TKPCAF PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKPLCAF TKPLCAF PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKPShape TKPShape PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKShapeSchema TKShapeSchema PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKStdLSchema TKStdLSchema PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKStdSchema TKStdSchema PATH_SUFFIXES lib lin64/gcc/lib bin) + FIND_LIBRARY(CAS_TKXCAFSchema TKXCAFSchema PATH_SUFFIXES lib lin64/gcc/lib bin) ENDIF() SET(CAS_KERNEL ${CAS_TKernel} ${CAS_TKMath}) -- 2.39.2