#
#########################################################################
-# Copyright (C) 2014-2015 OPEN CASCADE
+# Copyright (C) 2014-2016 OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
LIST(APPEND CMAKE_PREFIX_PATH "${OCCLICENSE_ROOT_DIR}")
ENDIF(OCCLICENSE_ROOT_DIR)
-FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES inc)
-FIND_PATH(OCCTLICENSE_INCLUDE_DIRS OCCLicense_Activate.hxx PATH_SUFFIXES inc)
-IF(OCCTLICENSE_INCLUDE_DIRS)
- LIST(APPEND CR_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
-ENDIF(OCCTLICENSE_INCLUDE_DIRS)
+FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES include/opencascade include/products)
+IF(CR_INCLUDE_DIRS)
+ SET(CR_UPCOUNT 2)
+ELSE(CR_INCLUDE_DIRS)
+ FIND_PATH(CR_INCLUDE_DIRS ShapeConvert.hxx PATH_SUFFIXES include inc)
+ENDIF(CR_INCLUDE_DIRS)
-FIND_LIBRARY(CR_TKCR NAMES TKCR)
-FIND_LIBRARY(CRKOCCLicense NAMES TKOCCLicense)
+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(CR_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+ FILE(TO_NATIVE_PATH ${CR_INCLUDE_DIRS} _cr_dir)
+ FILE(TO_NATIVE_PATH ${OCCTLICENSE_INCLUDE_DIRS} _lic_dir)
+ STRING(COMPARE NOTEQUAL ${_cr_dir} ${_lic_dir} _diff_dir)
+ IF(_diff_dir)
+ LIST(APPEND CR_INCLUDE_DIRS ${OCCTLICENSE_INCLUDE_DIRS})
+ ENDIF()
+ENDIF(CR_INCLUDE_DIRS AND OCCTLICENSE_INCLUDE_DIRS)
+
+FIND_LIBRARY(CR_TKCR NAMES TKCR PATH_SUFFIXES lib lin64/gcc/lib bin)
+FIND_LIBRARY(CRKOCCLicense NAMES TKOCCLicense PATH_SUFFIXES lib lin64/gcc/lib bin)
SET(CR_LIBRARIES
${CR_TKCR}