LIST(APPEND CMAKE_PREFIX_PATH "${OCCLICENSE_ROOT_DIR}")
ENDIF(OCCLICENSE_ROOT_DIR)
-FIND_PATH(DXF_INCLUDE_DIRS DxfData.hxx PATH_SUFFIXES inc)
-FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES inc)
-IF(OCCTLICENSE_INCLUDE_DIRS)
- LIST(APPEND DXF_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
-ENDIF(OCCTLICENSE_INCLUDE_DIRS)
-
-FIND_LIBRARY(DXF_TKACIS NAMES TKACIS)
-FIND_LIBRARY(DXF_TKDXF NAMES TKDXF)
-FIND_LIBRARY(DXF_TKXDEDXF NAMES TKXDEDXF)
-FIND_LIBRARY(DXF_TKOCCLicense NAMES TKOCCLicense)
+FIND_PATH(DXF_INCLUDE_DIRS DxfData.hxx PATH_SUFFIXES include/opencascade)
+IF(DXF_INCLUDE_DIRS)
+ SET(DXF_UPCOUNT 2)
+ELSE(DXF_INCLUDE_DIRS)
+ FIND_PATH(DXF_INCLUDE_DIRS DxfData.hxx PATH_SUFFIXES include inc)
+ENDIF(DXF_INCLUDE_DIRS)
+
+FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include/opencascade)
+IF(NOT OCCTLICENSE_INCLUDE_DIRS)
+ FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES include inc)
+ENDIF(NOT OCCTLICENSE_INCLUDE_DIRS)
+
+IF(DXF_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+ FILE(TO_NATIVE_PATH ${DXF_INCLUDE_DIRS} _dxf_dir)
+ FILE(TO_NATIVE_PATH ${OCCTLICENSE_INCLUDE_DIRS} _lic_dir)
+ STRING(COMPARE NOTEQUAL ${_dxf_dir} ${_lic_dir} _diff_dir)
+ IF(_diff_dir)
+ LIST(APPEND DXF_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
+ ENDIF()
+ENDIF(DXF_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+
+FIND_LIBRARY(DXF_TKACIS NAMES TKACIS PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(DXF_TKDXF NAMES TKDXF PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(DXF_TKXDEDXF NAMES TKXDEDXF PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(DXF_TKOCCLicense NAMES TKOCCLicense PATH_SUFFIXES lib lin64/gcc/lib bin)
SET(DXF_LIBRARIES
${DXF_TKACIS}