Migration on OCCT 7.1

[plugins/xtplugin.git] / adm_local / cmake_files / FindXT.cmake

diff --git a/adm_local/cmake_files/FindXT.cmake b/adm_local/cmake_files/FindXT.cmake
index 4fbc894d22dfc766b9851b3f43725e2e26198541..4766bd6fa08ac95ad81dc1ee61104ded91dddcfb 100644 (file)
--- a/adm_local/cmake_files/FindXT.cmake
+++ b/adm_local/cmake_files/FindXT.cmake
@@ -41,15 +41,30 @@ IF(OCCLICENSE_ROOT_DIR)
   LIST(APPEND CMAKE_PREFIX_PATH "${OCCLICENSE_ROOT_DIR}")
 ENDIF(OCCLICENSE_ROOT_DIR)
 
-FIND_PATH(XT_INCLUDE_DIRS XtData.hxx PATH_SUFFIXES inc)
-FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES inc)
-IF(OCCTLICENSE_INCLUDE_DIRS)
-  LIST(APPEND XT_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
-ENDIF(OCCTLICENSE_INCLUDE_DIRS)
-
-FIND_LIBRARY(XT_TKXDEXT NAMES TKXDEXT)
-FIND_LIBRARY(XT_TKXT NAMES TKXT)
-FIND_LIBRARY(XT_TKOCCLicense NAMES TKOCCLicense)
+FIND_PATH(XT_INCLUDE_DIRS XtData.hxx PATH_SUFFIXES include/opencascade include/products)
+IF(XT_INCLUDE_DIRS)
+  SET(XT_UPCOUNT 2)
+ELSE(XT_INCLUDE_DIRS)
+  FIND_PATH(XT_INCLUDE_DIRS XtData.hxx PATH_SUFFIXES include inc)
+ENDIF(XT_INCLUDE_DIRS)
+
+FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include/opencascade include/products)
+IF(NOT OCCTLICENSE_INCLUDE_DIRS)
+  FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include inc)
+ENDIF(NOT OCCTLICENSE_INCLUDE_DIRS)
+
+IF(XT_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+  FILE(TO_NATIVE_PATH ${XT_INCLUDE_DIRS} _xt_dir)
+  FILE(TO_NATIVE_PATH ${OCCTLICENSE_INCLUDE_DIRS} _lic_dir)
+  STRING(COMPARE NOTEQUAL ${_xt_dir} ${_lic_dir} _diff_dir)
+  IF(_diff_dir)
+    LIST(APPEND XT_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
+  ENDIF()
+ENDIF(XT_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+
+FIND_LIBRARY(XT_TKXDEXT NAMES TKXDEXT PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(XT_TKXT NAMES TKXT PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(XT_TKOCCLicense NAMES TKOCCLicense PATH_SUFFIXES lib lin64/gcc/lib bin)
 
 SET(XT_LIBRARIES
   ${XT_TKXT}