Improve search of the OCCT libraries.

diff --git a/adm_local/cmake_files/deprecated/FindCAS.cmake b/adm_local/cmake_files/deprecated/FindCAS.cmake
index c1132faf6e04b551b3e729caa197627fb72cfc81..d723db6cc578e60bc4a6e492ef2c19f7ade7c2fc 100644 (file)
--- a/adm_local/cmake_files/deprecated/FindCAS.cmake
+++ b/adm_local/cmake_files/deprecated/FindCAS.cmake
@@ -56,13 +56,6 @@ IF(CAS_VERSION_DEVELOPMENT STREQUAL 1)
   SET(CAS_CPPFLAGS "${CAS_CPPFLAGS} -DCAS_VERSION_DEVELOPMENT")
 ENDIF(CAS_VERSION_DEVELOPMENT STREQUAL 1)
 
-IF(NOT WINDOWS)
-  FIND_LIBRARY(Xmu Xmu)
-  IF(Xmu)
-    SET(CAS_LDPATH ${Xmu})
-  ENDIF(Xmu)
-ENDIF(NOT WINDOWS)
-
 IF(WINDOWS)
   IF(CMAKE_BUILD_TYPE STREQUAL Debug)
     SET(CASROOT_LIBDIR ${CASROOT}/win32/libd)
@@ -73,100 +66,109 @@ ELSE(WINDOWS)
   SET(CASROOT_LIBDIR ${CASROOT}/lib)
 ENDIF(WINDOWS)
 
-FIND_LIBRARY(BinLPlugin BinLPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(BinPlugin BinPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(BinTObjPlugin BinTObjPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(FWOSPlugin FWOSPlugin PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(mscmd mscmd PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(PTKernel PTKernel PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(StdLPlugin StdLPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(StdPlugin StdPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKAdvTools TKAdvTools PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBin TKBin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBinL TKBinL PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBinTObj TKBinTObj PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBinXCAF TKBinXCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBO TKBO PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBool TKBool PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKBRep TKBRep PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKCAF TKCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKCDF TKCDF PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCDLFront TKCDLFront PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCPPClient TKCPPClient PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCPPExt TKCPPExt PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCPPIntExt TKCPPIntExt PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCPPJini TKCPPJini PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKDCAF TKDCAF PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKDraw TKDraw PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKernel TKernel PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKFeat TKFeat PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKFillet TKFillet PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKG2d TKG2d PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKG3d TKG3d PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKGeomAlgo TKGeomAlgo PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKGeomBase TKGeomBase PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKHLR TKHLR PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKIDLFront TKIDLFront PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKIGES TKIGES PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKLCAF TKLCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKMath TKMath PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKMesh TKMesh PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKMeshVS TKMeshVS PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKNIS TKNIS PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKOffset TKOffset PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKOpenGl TKOpenGl PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKPCAF TKPCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKPLCAF TKPLCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKPrim TKPrim PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKPShape TKPShape PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKService TKService PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKShapeSchema TKShapeSchema PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKShHealing TKShHealing PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKStdLSchema TKStdLSchema PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKStdSchema TKStdSchema PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKSTEP TKSTEP PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKSTEP209 TKSTEP209 PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKSTEPAttr TKSTEPAttr PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKSTEPBase TKSTEPBase PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKSTL TKSTL PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKTCPPExt TKTCPPExt PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKTObj TKTObj PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKTObjDRAW TKTObjDRAW PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKTopAlgo TKTopAlgo PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKTopTest TKTopTest PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKV2d TKV2d PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKV3d TKV3d PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKViewerTest TKViewerTest PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKVRML TKVRML PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKWOK TKWOK PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKWOKTcl TKWOKTcl PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXCAF TKXCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXCAFSchema TKXCAFSchema PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKXDEDRAW TKXDEDRAW PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXDEIGES TKXDEIGES PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXDESTEP TKXDESTEP PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXMesh TKXMesh PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXml TKXml PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXmlL TKXmlL PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXmlTObj TKXmlTObj PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXmlXCAF TKXmlXCAF PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(TKXSBase TKXSBase PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(TKXSDRAW TKXSDRAW PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokcmd wokcmd PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokdeliverysteps wokdeliverysteps PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokdfltsteps wokdfltsteps PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokobjssteps wokobjssteps PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokorbixsteps wokorbixsteps PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(woksteps woksteps PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(woktoolscmd woktoolscmd PATHS ${CASROOT_LIBDIR})
-# FIND_LIBRARY(wokutilscmd wokutilscmd PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(XCAFPlugin XCAFPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(XmlLPlugin XmlLPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(XmlPlugin XmlPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(XmlTObjPlugin XmlTObjPlugin PATHS ${CASROOT_LIBDIR})
-FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin PATHS ${CASROOT_LIBDIR})
+SET(CMAKE_LIBRARY_PATH ${CASROOT_LIBDIR})
+
+IF(NOT WINDOWS)
+  FIND_LIBRARY(Xmu Xmu)
+  IF(Xmu)
+    SET(CAS_LDPATH ${Xmu})
+  ENDIF(Xmu)
+ENDIF(NOT WINDOWS)
+
+#FIND_LIBRARY(BinLPlugin BinLPlugin)
+#FIND_LIBRARY(BinPlugin BinPlugin)
+#FIND_LIBRARY(BinTObjPlugin BinTObjPlugin)
+#FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin)
+FIND_LIBRARY(FWOSPlugin FWOSPlugin)
+# FIND_LIBRARY(mscmd mscmd)
+FIND_LIBRARY(PTKernel PTKernel)
+FIND_LIBRARY(StdLPlugin StdLPlugin)
+FIND_LIBRARY(StdPlugin StdPlugin)
+FIND_LIBRARY(TKAdvTools TKAdvTools)
+FIND_LIBRARY(TKBin TKBin)
+FIND_LIBRARY(TKBinL TKBinL)
+FIND_LIBRARY(TKBinTObj TKBinTObj)
+FIND_LIBRARY(TKBinXCAF TKBinXCAF)
+FIND_LIBRARY(TKBO TKBO)
+FIND_LIBRARY(TKBool TKBool)
+FIND_LIBRARY(TKBRep TKBRep)
+FIND_LIBRARY(TKCAF TKCAF)
+FIND_LIBRARY(TKCDF TKCDF)
+# FIND_LIBRARY(TKCDLFront TKCDLFront)
+# FIND_LIBRARY(TKCPPClient TKCPPClient)
+# FIND_LIBRARY(TKCPPExt TKCPPExt)
+# FIND_LIBRARY(TKCPPIntExt TKCPPIntExt)
+# FIND_LIBRARY(TKCPPJini TKCPPJini)
+# FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema)
+# FIND_LIBRARY(TKDCAF TKDCAF)
+# FIND_LIBRARY(TKDraw TKDraw)
+FIND_LIBRARY(TKernel TKernel)
+FIND_LIBRARY(TKFeat TKFeat)
+FIND_LIBRARY(TKFillet TKFillet)
+FIND_LIBRARY(TKG2d TKG2d)
+FIND_LIBRARY(TKG3d TKG3d)
+FIND_LIBRARY(TKGeomAlgo TKGeomAlgo)
+FIND_LIBRARY(TKGeomBase TKGeomBase)
+FIND_LIBRARY(TKHLR TKHLR)
+# FIND_LIBRARY(TKIDLFront TKIDLFront)
+FIND_LIBRARY(TKIGES TKIGES)
+FIND_LIBRARY(TKLCAF TKLCAF)
+FIND_LIBRARY(TKMath TKMath)
+FIND_LIBRARY(TKMesh TKMesh)
+FIND_LIBRARY(TKMeshVS TKMeshVS)
+FIND_LIBRARY(TKNIS TKNIS)
+FIND_LIBRARY(TKOffset TKOffset)
+FIND_LIBRARY(TKOpenGl TKOpenGl)
+FIND_LIBRARY(TKPCAF TKPCAF)
+FIND_LIBRARY(TKPLCAF TKPLCAF)
+FIND_LIBRARY(TKPrim TKPrim)
+FIND_LIBRARY(TKPShape TKPShape)
+FIND_LIBRARY(TKService TKService)
+FIND_LIBRARY(TKShapeSchema TKShapeSchema)
+FIND_LIBRARY(TKShHealing TKShHealing)
+FIND_LIBRARY(TKStdLSchema TKStdLSchema)
+FIND_LIBRARY(TKStdSchema TKStdSchema)
+FIND_LIBRARY(TKSTEP TKSTEP)
+FIND_LIBRARY(TKSTEP209 TKSTEP209)
+FIND_LIBRARY(TKSTEPAttr TKSTEPAttr)
+FIND_LIBRARY(TKSTEPBase TKSTEPBase)
+FIND_LIBRARY(TKSTL TKSTL)
+# FIND_LIBRARY(TKTCPPExt TKTCPPExt)
+FIND_LIBRARY(TKTObj TKTObj)
+# FIND_LIBRARY(TKTObjDRAW TKTObjDRAW)
+FIND_LIBRARY(TKTopAlgo TKTopAlgo)
+# FIND_LIBRARY(TKTopTest TKTopTest)
+FIND_LIBRARY(TKV2d TKV2d)
+FIND_LIBRARY(TKV3d TKV3d)
+# FIND_LIBRARY(TKViewerTest TKViewerTest)
+FIND_LIBRARY(TKVRML TKVRML)
+# FIND_LIBRARY(TKWOK TKWOK)
+# FIND_LIBRARY(TKWOKTcl TKWOKTcl)
+FIND_LIBRARY(TKXCAF TKXCAF)
+FIND_LIBRARY(TKXCAFSchema TKXCAFSchema)
+# FIND_LIBRARY(TKXDEDRAW TKXDEDRAW)
+FIND_LIBRARY(TKXDEIGES TKXDEIGES)
+FIND_LIBRARY(TKXDESTEP TKXDESTEP)
+FIND_LIBRARY(TKXMesh TKXMesh)
+FIND_LIBRARY(TKXml TKXml)
+FIND_LIBRARY(TKXmlL TKXmlL)
+FIND_LIBRARY(TKXmlTObj TKXmlTObj)
+FIND_LIBRARY(TKXmlXCAF TKXmlXCAF)
+FIND_LIBRARY(TKXSBase TKXSBase)
+# FIND_LIBRARY(TKXSDRAW TKXSDRAW)
+# FIND_LIBRARY(wokcmd wokcmd)
+# FIND_LIBRARY(wokdeliverysteps wokdeliverysteps)
+# FIND_LIBRARY(wokdfltsteps wokdfltsteps)
+# FIND_LIBRARY(wokobjssteps wokobjssteps)
+# FIND_LIBRARY(wokorbixsteps wokorbixsteps)
+# FIND_LIBRARY(woksteps woksteps)
+# FIND_LIBRARY(woktoolscmd woktoolscmd)
+# FIND_LIBRARY(wokutilscmd wokutilscmd)
+FIND_LIBRARY(XCAFPlugin XCAFPlugin)
+FIND_LIBRARY(XmlLPlugin XmlLPlugin)
+FIND_LIBRARY(XmlPlugin XmlPlugin)
+FIND_LIBRARY(XmlTObjPlugin XmlTObjPlugin)
+FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin)
 
 SET(CAS_KERNEL ${TKernel} ${TKMath})
 SET(CAS_OCAF ${TKernel} ${TKMath} ${TKCDF} ${TKLCAF})