0026791: Visualization, TKOpenGl - apply view resolution to built-in markers

Add ResolutionRatio() method in the Graphic3d_RenderingParams.
Add SetResolutionRatio() method in the OpenGl_Context.

CMakeLists.txt

@@ -86,11 +86,6 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
   BUILD_MODULE (${OCCT_MODULE})
 endforeach()
 
-if (ANDROID AND BUILD_MODULE_Draw)
-  message (STATUS "Info. Draw module is turned off due to it is not supported on Android")
-  set (BUILD_MODULE_Draw OFF CACHE BOOL "${BUILD_MODULE_Draw_DESCR}" FORCE)
-endif()
-
 # Overview
 set (BUILD_DOC_OcctOverview OFF CACHE BOOL "${BUILD_DOC_OcctOverview_DESCR}")
 
@@ -138,7 +133,7 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")
 list (FIND BUILD_TOOLKITS TKMath   CAN_REBUILD_PDC_FOR_TKMATH)
 list (FIND BUILD_TOOLKITS StepFile CAN_REBUILD_PDC_FOR_STEPFILE)
 
-if (NOT ${CAN_REBUILD_PDC_FOR_TKMATH} EQUAL -1 OR NOT ${CAN_REBUILD_PDC_FOR_STEPFILE} EQUAL -1)
+if (NOT "${CAN_REBUILD_PDC_FOR_TKMATH}" STREQUAL "-1" OR NOT "${CAN_REBUILD_PDC_FOR_STEPFILE}" STREQUAL "-1")
   set (REBUILD_PLATFORM_DEPENDENT_CODE OFF CACHE BOOL "${REBUILD_PLATFORM_DEPENDENT_CODE_DESCR}")
 else()
   OCCT_CHECK_AND_UNSET (REBUILD_PLATFORM_DEPENDENT_CODE)
@@ -146,13 +141,23 @@ endif()
 
 if (NOT DEFINED 3RDPARTY_DIR)
   set (3RDPARTY_DIR "" CACHE PATH ${3RDPARTY_DIR_DESCR})
-  get_filename_component (3RDPARTY_DIR "${3RDPARTY_DIR}" ABSOLUTE)
+endif()
+
+# search for 3rdparty dir
+if ("${3RDPARTY_DIR}" STREQUAL "")
+  if (DEFINED ENV{3RDPARTY_DIR})
+    set (3RDPARTY_DIR "$ENV{3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_DESCR} FORCE)
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/../")
+    # in version 6.7.0 and above, occt parent directory contains 3rdparties
+    get_filename_component (3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/../" ABSOLUTE)
+    set (3RDPARTY_DIR "${3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_DESCR} FORCE)
+  endif()
 endif()
 
 # search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
 
-if (USE_TCL)
+if ("${USE_TCL}" STREQUAL ON)
   message (STATUS "Info: TCL is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
   
@@ -169,7 +174,7 @@ endif()
 # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
 
-if (USE_FREETYPE)
+if ("${USE_FREETYPE}" STREQUAL ON)
   message (STATUS "Info: Freetype is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
 else()
@@ -185,7 +190,7 @@ if (USE_VTK)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
-  #OCCT_CHECK_AND_UNSET ("INSTALL_VTK")
+  OCCT_CHECK_AND_UNSET ("INSTALL_VTK")
 endif()
 
 # D3D
@@ -363,15 +368,11 @@ if ("${INSTALL_DIR}" STREQUAL "")
   message (STATUS "Info: INSTALL_DIR has been set as ${INSTALL_DIR}")
 endif()
 
-string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
+message (STATUS "\nInfo: Collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
 
 # collect all the headers to <binary dir>/inc folder
 COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")
 
-string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-message (STATUS "Info: \(${CURRENT_TIME}\) End the collecting")
-
 OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_DIR}")
 OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/samples")
 
@@ -475,9 +476,6 @@ foreach(RESOURCE ${RESOURCES})
   endif()
 endforeach()
 
-# define CSF variable
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
-
 # include patched toolkit projects or original ones
 foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
   OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")

adm/UDLIST

@@ -67,7 +67,6 @@ n GeomLProp
 n GeomLib
 n GeomProjLib
 n GeomTools
-n GeomEvaluator
 n Hermit
 n IntAna
 n IntAna2d

adm/cmake/3rdparty_macro.cmake

@@ -1,103 +1,113 @@
-##
-
-if(3RDPARTY_MACRO_ALREADY_INCLUDED)
-  return()
-endif()
-set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
+#
 
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEBUG)
 
-  if (NOT DEFINED INSTALL_${PRODUCT_NAME})
-    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
-  endif()
-
+  # define 3RDPARTY_${PRODUCT_NAME}_DIR variable is it isn't defined
   if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
     set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
   endif()
 
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-  # specify product folder in connectin with 3RDPARTY_DIR
-  if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-    #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
-
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
-      if (${PRODUCT_NAME}_DIR_NAME)
-        set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-      endif()
+  # search for product directory inside 3RDPARTY_DIR directory
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR AND 3RDPARTY_DIR)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "${PRODUCT_NAME}" ${PRODUCT_NAME}_DIR_NAME)
+    if (${PRODUCT_NAME}_DIR_NAME)
+      message (STATUS "Info: ${PRODUCT_NAME}: ${${PRODUCT_NAME}_DIR_NAME} folder is used")
+      set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
     endif()
-  else()
-    #set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
   endif()
 
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR           "" CACHE PATH "the path of ${HEADER_NAME}")
+  if (NOT DEFINED INSTALL_${PRODUCT_NAME})
+    message (STATUS "${INSTALL_${PRODUCT_NAME}_DESCR}")
+    if (NOT "${INSTALL_${PRODUCT_NAME}_DESCR}" STREQUAL "")
+      set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
+    else()
+      set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} required to be copied into install directory")
+    endif()
   endif()
 
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY               "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+  # search for include directory
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
+    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS
+                                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/include"
+                                                                    ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_HEADER}
+                                                                   NO_DEFAULT_PATH)
+    find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME})
+  endif()
+
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of the ${PRODUCT_NAME}" FORCE)
+  endif()
+
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+  elseif (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    get_filename_component(3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
+    if (NOT "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_TMP}")
+      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+    endif()
+  endif()
+
+  # search for library
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
+
+    find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME} PATHS
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}"
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib"
+                                                                   ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_LIB}
+                                                                   NO_DEFAULT_PATH)
+    # second search if previous one do not find anything
+    find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME})
   endif()
 
   if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR           "" CACHE PATH "The directory containing ${PRODUCT_NAME} library")
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
   endif()
 
+  # library path
+  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
+    get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
+    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} library" FORCE)
+  endif()
+
+  # search for shared library (just for win case)
   if (WIN32)
-    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
-      set (3RDPARTY_${PRODUCT_NAME}_DLL                 "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-    endif()
-  endif()
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
-  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR             "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library")
-    endif()
-  endif()
-
-  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-  if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR PATH "the path to ${PRODUCT_NAME}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY FILEPATH "the path to ${PRODUCT_NAME} library")
-
-    if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-    else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR PATH "The directory containing ${PRODUCT_NAME} library")
-    endif()
-
-    if (WIN32)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL FILEPATH "the path to ${PRODUCT_NAME} shared library")
-
-      if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-        get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-      else()
-      
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR PATH "The directory containing ${PRODUCT_NAME} shared library")
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
+    elseif (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      get_filename_component(3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
+      if (NOT "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_TMP}")
+        set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
       endif()
     endif()
-  endif()
 
-  # header
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
 
-    # set 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to ${HEADER_NAME}" FORCE)
+      find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}" PATHS
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}"
+                                                                   "${3RDPARTY_${PRODUCT_NAME}_DIR}/bin"
+                                                                   ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL}
+                                                                   NO_DEFAULT_PATH)
 
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
-                                                      PATH_SUFFIXES include
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
-                                                      NO_DEFAULT_PATH)
-    else()
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATH_SUFFIXES include
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}")
+    endif()
+
+    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
+    endif()
+
+    # shared library path
+    if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
+      set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
     endif()
   endif()
 
@@ -105,79 +115,16 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
     list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
   else()
     list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
   endif()
 
-  # library
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
-
-    set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
-    if (ANDROID)
-      set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
-    endif()
-
-    # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library" FORCE)
-
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY NAMES ${LIBRARY_NAME}
-                                                     PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                     PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                     CMAKE_FIND_ROOT_PATH_BOTH
-                                                     NO_DEFAULT_PATH)
-    else()
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY NAMES ${LIBRARY_NAME} 
-                                                     PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                     CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
-
-    if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-    else()
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-    endif()
-  endif()
-
-  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
+  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
     list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
   else()
     list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library" FORCE)
   endif()
 
-  # shared library
   if (WIN32)
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-
-      # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
-      set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library" FORCE)
-
-      if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL  NAMES ${LIBRARY_NAME}
-                                                    PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                    PATH_SUFFIXES bin
-                                                    NO_DEFAULT_PATH)
-      else()
-        find_library (3RDPARTY_${PRODUCT_NAME}_DLL NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
-      endif()
-
-      if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-        get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-      else()
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-
-        set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-      endif()
-    endif()
-
-    if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
+    if (3RDPARTY_${PRODUCT_NAME}_DLL OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
       list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
     else()
       list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)

adm/cmake/bison.cmake

@@ -9,7 +9,7 @@ endif()
 # BISON_EXECUTABLE is required by BISON_TARGET macro and should be defined
 set (BISON_EXECUTABLE "${3RDPARTY_BISON_EXECUTABLE}" CACHE FILEPATH "path to the bison executable" FORCE)
 
-find_package (BISON)
+find_package (Bison)
 
 if (BISON_FOUND)
   set (3RDPARTY_BISON_EXECUTABLE "${BISON_EXECUTABLE}" CACHE FILEPATH "The Path to the bison command" FORCE)

adm/cmake/freetype.cmake

@@ -8,27 +8,29 @@ if (NOT DEFINED 3RDPARTY_FREETYPE_DIR)
   set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype")
 endif()
 
+# store ENV{FREETYPE_DIR}
+SET (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
+
 # include occt macros. compiler_bitness, os_wiht_bit, compiler
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 OCCT_MAKE_COMPILER_SHORT_NAME()
 OCCT_MAKE_COMPILER_BITNESS()
 
-# specify freetype folder in connectin with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
-
-  if (NOT 3RDPARTY_FREETYPE_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
+if (NOT ENV{FREETYPE_DIR})
+  # search for freetype in user defined directory
+  if (NOT 3RDPARTY_FREETYPE_DIR AND 3RDPARTY_DIR)
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
     if (FREETYPE_DIR_NAME)
       set (3RDPARTY_FREETYPE_DIR "${3RDPARTY_DIR}/${FREETYPE_DIR_NAME}" CACHE PATH "The directory containing freetype" FORCE)
     endif()
   endif()
-else()
-  #set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype" FORCE)
+
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
+  endif()
 endif()
 
-# define required freetype variables
 if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
   set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
 endif()
@@ -37,257 +39,173 @@ if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
   set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path of freetype2")
 endif()
 
-if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-  set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library" FORCE)
+if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR)
+  set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library")
 endif()
 
 if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
-  set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE PATH "The directory containing freetype library")
+  set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE FILEPATH "The directory containing freetype library")
 endif()
 
 if (WIN32)
-  if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
-    set (3RDPARTY_FREETYPE_DLL                 "" CACHE FILEPATH "freetype shared library" FORCE)
+  if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR)
+    set (3RDPARTY_FREETYPE_DLL                   "" CACHE FILEPATH "freetype shared library")
   endif()
 endif()
 
 if (WIN32)
   if (NOT DEFINED 3RDPARTY_FREETYPE_DLL_DIR)
-    set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE PATH "The directory containing freetype shared library")
+    set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE FILEPATH "The directory containing freetype shared library")
   endif()
 endif()
 
-# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
+find_package(Freetype)
 
-  if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-  else()
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY_DIR PATH "The directory containing freetype library")
-  endif()
-
-  if (WIN32)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL FILEPATH "the path to freetype shared library")
-
-    if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-      get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-      set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype shared library" FORCE)
-    else()
-    
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL_DIR PATH "The directory containing freetype shared library")
-    endif()
+# ft2build header
+if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+    set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "the path of ft2build.h" FORCE)
   endif()
 endif()
 
-# the FIRST step in search for freetype library and header folders (built-in search engine)
-
-# execute built-in search engine to seek freetype
-set (IS_BUILTIN_SEARCH_REQUIRED OFF)
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-elseif (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-elseif (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-#elseif (WIN32)
-  #if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-  #  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-  #endif()
-endif()
-
-if (IS_BUILTIN_SEARCH_REQUIRED)
-
-  # use 3RDPARTY_FREETYPE_DIR if it is specified for freetype search
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    set (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
-    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
-  endif()
-
-  find_package(Freetype)
-
-  # restore ENV{FREETYPE_DIR}
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
-  endif()
-
-  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "the path to ft2build.h")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "the path to ftheader.h")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
-  endif()
-
-  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "the path to ft2build.h" FORCE)
-    endif()
-  endif()
-
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "the path to ftheader.h" FORCE)
-    endif()
-  endif()
-
-  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
-      set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY}" CACHE FILEPATH "The path to freetype library" FORCE)
-    endif()
-  endif()
-
-  if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-  else()
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-  endif()
-endif()
-
-# the SECOND step in search for freetype library and header folders (additional search algorithms)
-
-# ft2build.h
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
-
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "the path to ft2build.h" FORCE)
-
-  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
+if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+  # cmake (version is < 3.0) doesn't find ftheader.h of freetype (version is >= 2.5.1)
   # do search taking into account freetype structure of 2.5.1 version
+  find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES
+                                             freetype/config/ftheader.h
+                                             config/ftheader.h
+                                           HINTS
+                                             ENV FREETYPE_DIR
+                                           PATHS
+                                             /usr/X11R6
+                                             /usr/local/X11R6
+                                             /usr/local/X11
+                                             /usr/freeware
+                                           PATH_SUFFIXES include/freetype2 include freetype2
+                                           NO_DEFAULT_PATH)
+  find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES freetype/config/ftheader.h config/ftheader.h)
+elseif (FREETYPE_INCLUDE_DIR_freetype2 OR EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
   if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-                                                      PATHS ${3RDPARTY_FREETYPE_DIR}
-                                                      PATH_SUFFIXES include freetype2 include/freetype2
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
-                                                      NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-                                                      PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-                                                      PATH_SUFFIXES include/freetype2 include freetype2
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-endif()
+    get_filename_component (3RDPARTY_FREETYPE_DIR_ABS "${3RDPARTY_FREETYPE_DIR}" ABSOLUTE)
+    get_filename_component (FREETYPE_INCLUDE_DIR_freetype2_ABS "${FREETYPE_INCLUDE_DIR_freetype2}" ABSOLUTE)
 
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+    string (REGEX MATCH "${3RDPARTY_FREETYPE_DIR_ABS}" DOES_PATH_CONTAIN "${FREETYPE_INCLUDE_DIR_freetype2_ABS}")
 
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "the path to ft2build.h" FORCE)
-endif()
+    if (NOT DOES_PATH_CONTAIN) # if cmake found freetype2 at different place from 3RDPARTY_FREETYPE_DIR
+      # search for freetype2 in 3RDPARTY_FREETYPE_DIR and if it will be found - replace freetyp2 path by new one
+      set (TMP_FREETYPE2 "TMP_FREETYPE2-NOTFOUND" CACHE FILEPATH "" FORCE)
+      find_path (TMP_FREETYPE2 NAMES freetype/config/ftheader.h config/ftheader.h
+                               PATHS "${3RDPARTY_FREETYPE_DIR}"
+                               PATH_SUFFIXES include/freetype2 include freetype2
+                               NO_DEFAULT_PATH)
 
-# ftheader.h
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
+      if (TMP_FREETYPE2 OR NOT EXISTS "${TMP_FREETYPE2}")
+        set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${TMP_FREETYPE2}" CACHE FILEPATH "the path of freetype2" FORCE)
 
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "the path to ftheader.h" FORCE)
-
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-                                                       HINTS ${3RDPARTY_FREETYPE_DIR}
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
-                                                       CMAKE_FIND_ROOT_PATH_BOTH
-                                                       NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-                                                       PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
-                                                       CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-endif()
-
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
-
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path to ftheader.h" FORCE)
-endif()
-
-# freetype library
-if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-  set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
-
-  set (FREETYPE_PATH_SUFFIXES lib)
-  if (ANDROID)
-    set (FREETYPE_PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES} libs/${ANDROID_ABI})
-  endif()
-
-  # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
-  set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
-
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    find_library (3RDPARTY_FREETYPE_LIBRARY freetype
-                                            PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
-                                            PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-                                            CMAKE_FIND_ROOT_PATH_BOTH
-                                            NO_DEFAULT_PATH)
-  else()
-    find_library (3RDPARTY_FREETYPE_LIBRARY freetype 
-                                            PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-                                            CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
-
-  if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-  else()
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-  endif()
-endif()
-
-if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_LIBRARY_DIR)
-
-  set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
-endif()
-
-# freetype shared library
-if (WIN32)
-  if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-    
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-
-    # set 3RDPARTY_FREETYPE_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_DLL
-    set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "The path to freetype shared library" FORCE)
-
-    if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-      find_library (3RDPARTY_FREETYPE_DLL freetype
-                                          PATHS "${3RDPARTY_FREETYPE_DIR}"
-                                          PATH_SUFFIXES bin
-                                          NO_DEFAULT_PATH)
-    else()
-      find_library (3RDPARTY_FREETYPE_DLL freetype
-                                          PATH_SUFFIXES bin)
+        # hide and remove TMP_FREETYPE2
+        mark_as_advanced (TMP_FREETYPE2)
+        unset (TMP_FREETYPE2)
+      endif()
     endif()
+  endif()
+endif()
 
-    if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-      get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-      set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-    else()
-      set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE PATH "The directory containing freetype shared library" FORCE)
+# return ENV{FREETYPE_DIR}
+SET (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
 
+# freetype2 header
+if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+    set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "the path of freetype2" FORCE)
+  endif()
+endif()
+
+if (NOT 3RDPARTY_FREETYPE_LIBRARY_DIR)
+  set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "freetype library" FORCE)
+elseif (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+  get_filename_component(3RDPARTY_FREETYPE_LIBRARY_DIR_TMP "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+  if (NOT "${3RDPARTY_FREETYPE_LIBRARY_DIR}" STREQUAL "${3RDPARTY_FREETYPE_LIBRARY_DIR_TMP}")
+    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "freetype library" FORCE)
+  endif()
+endif()
+
+if (WIN32)
+  if (NOT 3RDPARTY_FREETYPE_DLL_DIR)
+    set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
+  elseif (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+    get_filename_component(3RDPARTY_FREETYPE_DLL_DIR_TMP "${3RDPARTY_FREETYPE_DLL}" PATH)
+    if (NOT "${3RDPARTY_FREETYPE_DLL_DIR}" STREQUAL "${3RDPARTY_FREETYPE_DLL_DIR_TMP}")
       set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
     endif()
   endif()
+endif()
 
-  if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+# freetype library
+if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
+  if (NOT 3RDPARTY_FREETYPE_LIBRARY)
+    set (3RDPARTY_FREETYPE_LIBRARY "${FREETYPE_LIBRARY}" CACHE FILEPATH "freetype library" FORCE)
+  endif()
+
+  if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+    set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE FILEPATH "The directory containing freetype library" FORCE)
+  endif()
+
+  if (WIN32)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+    if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+      get_filename_component (FREETYPE_LIBRARY_PARENT_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" PATH) # parent of the library directory
+
+      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "freetype shared library" FORCE)
+      find_library (3RDPARTY_FREETYPE_DLL freetype PATHS "${FREETYPE_LIBRARY_PARENT_DIR}/bin" NO_DEFAULT_PATH)
+    endif()
+
+    if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+      get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
+      set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE FILEPATH "The directory containing freetype shared library" FORCE)
+    endif()
+  endif()
+endif()
+
+
+if (NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+  set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE FILEPATH "The directory containing freetype library" FORCE)
+endif()
+
+if (WIN32)
+  if (NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+    set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE FILEPATH "The directory containing shared freetype library" FORCE)
+  endif()
+endif()
+
+# include found paths to common variables
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+endif()
+
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+endif()
+
+if (3RDPARTY_FREETYPE_LIBRARY)
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_LIBRARY_DIR)
+endif()
+
+if (WIN32)
+  if (3RDPARTY_FREETYPE_DLL OR EXISTS "${3RDPARTY_FREETYPE_DLL}")
     list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
   else()
     list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_DLL_DIR)
   endif()
 endif()
 
-
-# install instructions
 if (INSTALL_FREETYPE)
 
   OCCT_MAKE_OS_WITH_BITNESS()
@@ -302,21 +220,21 @@ if (INSTALL_FREETYPE)
              CONFIGURATIONS Debug
              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
   else()
-    get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
-    get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
+    get_filename_component(ABS_PATH ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
+    get_filename_component(FREETYPELIB ${3RDPARTY_FREETYPE_LIBRARY} NAME)
 
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+    install (FILES "${ABS_PATH}"
              CONFIGURATIONS Release
              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+             RENAME ${FREETYPELIB}.6)
+    install (FILES "${ABS_PATH}"
              CONFIGURATIONS RelWithDebInfo
              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+             RENAME ${FREETYPELIB}.6)
+    install (FILES "${ABS_PATH}"
              CONFIGURATIONS Debug
              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-             RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+             RENAME ${FREETYPELIB}.6)
   endif()
 
   set (USED_3RDPARTY_FREETYPE_DIR "")
@@ -334,4 +252,4 @@ OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
 OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY)
 
-mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)
+mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)

adm/cmake/occt_csf.cmake

@@ -1,122 +0,0 @@
-# CSF variables definition
-
-if(CSFS_ALREADY_INCLUDED)
-  return()
-endif()
-set(CSFS_ALREADY_INCLUDED 1)
-
-
-if (NOT DEFINED USE_TCL)
-  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
-endif()
-
-if (USE_TCL)
-  if ("${3RDPARTY_TCL_LIBRARY_VERSION}" STREQUAL "")
-    message (STATUS "Warning. TCL version has not been specified by CSF_TclLibs defining thus it will be used as 8.6")
-    set (3RDPARTY_TCL_LIBRARY_VERSION "8.6")
-  endif()
-
-  if ("${3RDPARTY_TK_LIBRARY_VERSION}" STREQUAL "")
-    message (STATUS "Warning. TK version has not been specified by CSF_TclTkLibs defining thus it will be used as 8.6")
-    set (3RDPARTY_TK_LIBRARY_VERSION "8.6")
-  endif()
-endif()
-
-if (USE_VTK AND NOT 3RDPARTY_VTK_REQUIRED_LIBRARIES)
-  message (WARNING "CSF_VTK specification: VTK libraries are not defined")
-endif()
-
-if (USE_TBB)
-  set (CSF_TBB "tbb tbbmalloc")
-else()
-  set (CSF_TBB)
-endif()
-
-if (WIN32)
-  set (CSF_advapi32      "advapi32.lib")
-  set (CSF_gdi32         "gdi32.lib")
-  set (CSF_user32        "user32.lib")
-  set (CSF_wsock32       "wsock32.lib")
-  set (CSF_AviLibs       "ws2_32.lib vfw32.lib")
-  set (CSF_OpenGlLibs    "opengl32.lib glu32.lib")
-
-  if (USE_TCL)
-    set (CSF_TclLibs     "tcl${3RDPARTY_TCL_LIBRARY_VERSION}.lib")
-    set (CSF_TclTkLibs   "tk${3RDPARTY_TK_LIBRARY_VERSION}.lib")
-  endif()
-
-  if (USE_VTK)
-    set (CSF_VTK "${3RDPARTY_VTK_REQUIRED_LIBRARIES}")
-  else()
-    set (CSF_VTK)
-  endif()
-
-else()
-
-  if (APPLE)
-    set (CSF_objc        "objc")
-
-    # frameworks
-    find_library (Appkit_LIB NAMES Appkit)
-    set (CSF_Appkit ${Appkit_LIB})
-
-    find_library (IOKit_LIB NAMES IOKit)
-    set (CSF_IOKit ${IOKit_LIB})
-
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
-    OCCT_CHECK_AND_UNSET (IOKit_LIB)
-
-    if (USE_GLX)
-      set (CSF_OpenGlLibs GL)
-      set (CSF_XwLibs     "X11 Xext Xmu Xi")
-    else()
-      find_library (OpenGlLibs_LIB NAMES OpenGL)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    endif()
-    
-    if (USE_TCL)
-      set (CSF_TclTkLibs Tk)
-      set (CSF_TclLibs   Tcl)
-    endif()
-  elseif (ANDROID)
-    set (CSF_ThreadLibs  "c")
-    set (CSF_OpenGlLibs  "EGL GLESv2")
-  elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt")
-    set (CSF_OpenGlLibs  "GLU GL")
-    set (CSF_XwLibs      "X11 Xext Xmu Xi")
-
-    if (USE_TCL)
-      set (CSF_TclLibs     "tcl${3RDPARTY_TCL_LIBRARY_VERSION}")
-      set (CSF_TclTkLibs   "tk${3RDPARTY_TK_LIBRARY_VERSION}")
-    endif()
-  endif()
-
-  if (USE_FREETYPE)
-    set (CSF_FREETYPE "freetype")
-  else()
-    set (CSF_FREETYPE)
-  endif()
-
-  if (USE_FREEIMAGE)
-    set (CSF_FreeImagePlus "freeimage")
-  else()
-    set (CSF_FreeImagePlus)
-  endif()
-
-  if (NOT DEFINED ANDROID)
-    if (USE_GL2PS)
-      set (CSF_GL2PS "gl2ps")
-    else()
-      set (CSF_GL2PS)
-    endif()
-  endif()
-  
-  if (USE_VTK)
-    set (CSF_VTK "${3RDPARTY_VTK_REQUIRED_LIBRARIES}")
-  else()
-    set (CSF_VTK)
-  endif()
-endif()

adm/cmake/occt_defs_flags.cmake

@@ -1,10 +1,3 @@
-##
-
-if(FLAGS_ALREADY_INCLUDED)
-  return()
-endif()
-set(FLAGS_ALREADY_INCLUDED 1)
-
 
 if (MSVC)
   add_definitions(/fp:precise)
@@ -82,26 +75,20 @@ endif()
 # generate a single response file which enlist all of the object files
 SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
 SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
+# increase compiler warnings level (-W4 for MSVC, -Wall for GCC)
 if (MSVC)
   if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
     string (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   else()
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
   endif()
-elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
 if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
 endif()
 
-# Optimize size of binaries
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-endif()
-
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
 set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")

adm/cmake/occt_macros.cmake

@@ -1,11 +1,4 @@
-##
-
-if(OCCT_MACROS_ALREADY_INCLUDED)
-  return()
-endif()
-set(OCCT_MACROS_ALREADY_INCLUDED 1)
-
-
+#
 macro (OCCT_CHECK_AND_UNSET VARNAME)
   if (DEFINED ${VARNAME})
     unset (${VARNAME} CACHE)
@@ -98,14 +91,15 @@ function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
   file (GLOB ORIGIN_FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
   foreach (ORIGIN_FILE ${ORIGIN_FILES})
     # check for existence of patched version of current file
-    if (NOT APPLY_OCCT_PATCH_DIR OR NOT EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
-      list (APPEND FOUND_FILES ${ORIGIN_FILE})
-    else()
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
       get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME)
-      if (NOT EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
-        list (APPEND FOUND_FILES ${ORIGIN_FILE})
+      if (EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
+        continue()
       endif()
     endif()
+
+    # append origin version if patched one is not found
+    list (APPEND FOUND_FILES ${ORIGIN_FILE})
   endforeach()
 
   set (${RESULT} ${FOUND_FILES} PARENT_SCOPE)
@@ -117,11 +111,16 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
 
   string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
 
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
+  list (APPEND SEARCH_TEMPLATES "^${lower_PRODUCT_NAME}.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "^${lower_PRODUCT_NAME}.*[0-9.]+")
+  list (APPEND SEARCH_TEMPLATES "^${lower_PRODUCT_NAME}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER_BITNESS}")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+")
+  list (APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}")
 
   SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
 
@@ -141,7 +140,9 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   endforeach()
 
   if (LOCAL_RESULT)
-    list (GET LOCAL_RESULT -1 DUMMY)
+    list (LENGTH "${LOCAL_RESULT}" LOC_LEN)
+    math (EXPR LAST_ELEMENT_INDEX "${LOC_LEN}-1")
+    list (GET LOCAL_RESULT ${LAST_ELEMENT_INDEX} DUMMY)
     set (${RESULT} ${DUMMY} PARENT_SCOPE)
   endif()
 endfunction()
@@ -177,7 +178,7 @@ macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME
 endmacro()
 
 macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
-  set (OCCT_USED_PACKAGES)
+  set (OCCT_SOURCE_DIRS)
 
   # consider patched header.in template
   set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in")
@@ -188,124 +189,43 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
   set (ROOT_OCCT_DIR ${CMAKE_SOURCE_DIR})
 
   foreach (OCCT_USED_TOOLKIT ${OCCT_BUILD_TOOLKITS})
+    # append parent folder
+    list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT})
+
     # append all required package folders
-    set (OCCT_TOOLKIT_PACKAGES)
+    set (OCCT_USED_TOOLKIT_DEPS)
     if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
     elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_TOOLKIT_PACKAGES)
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
     endif()
 
-    list (APPEND OCCT_USED_PACKAGES ${OCCT_TOOLKIT_PACKAGES})
+    foreach (OCCT_USED_TOOLKIT_DEP ${OCCT_USED_TOOLKIT_DEPS})
+      list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT_DEP})
+    endforeach()
   endforeach()
 
-  list (REMOVE_DUPLICATES OCCT_USED_PACKAGES)
+  foreach (OCCT_SOURCE_DIR ${OCCT_SOURCE_DIRS})
+    # get all header files from each src folder
+    file (GLOB OCCT_HEADER_FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
+    install (FILES ${OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
 
-  set (OCCT_HEADER_FILES_COMPLETE)
-  set (OCCT_HEADER_FILE_NAMES_NOT_IN_FILES)
-  set (OCCT_HEADER_FILE_WITH_PROPER_NAMES)
+    # create new file including found header
+    foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES})
+      get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
+      configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
+    endforeach()
 
-  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Compare FILES with files in package directories...")
+    # consider pathed the source files
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}")
+      file (GLOB PATCHED_OCCT_HEADER_FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
+      install (FILES ${PATCHED_OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
 
-  foreach (OCCT_PACKAGE ${OCCT_USED_PACKAGES})
-    if (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES" OCCT_ALL_FILE_NAMES)
-
-      list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
-      math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
-
-      # emit warnings if there is unprocessed headers
-      file (GLOB OCCT_ALL_FILES_IN_DIR "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/*.*")
-      foreach (OCCT_FILE_IN_DIR ${OCCT_ALL_FILES_IN_DIR})
-        get_filename_component (OCCT_FILE_IN_DIR_NAME ${OCCT_FILE_IN_DIR} NAME)
-
-        set (OCCT_FILE_IN_DIR_STATUS OFF)
-
-        if (${ALL_FILES_NB} LESS 0)
-          break()
-        endif()
-
-        foreach (FILE_INDEX RANGE ${ALL_FILES_NB})
-          list (GET OCCT_ALL_FILE_NAMES ${FILE_INDEX} OCCT_FILE_NAME)
-
-          if ("${OCCT_FILE_IN_DIR_NAME}" STREQUAL "${OCCT_FILE_NAME}")
-            set (OCCT_FILE_IN_DIR_STATUS ON)
-
-            string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
-            if (IS_HEADER_FOUND)
-              list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
-
-              # collect header files with name that does not contain its package one
-              string (FIND "${OCCT_FILE_NAME}" "${OCCT_PACKAGE}_" FOUND_INDEX)
-              if (NOT ${FOUND_INDEX} EQUAL 0)
-                list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
-              endif()            
-            endif()
-
-            # remove found element from list
-            list (REMOVE_AT OCCT_ALL_FILE_NAMES ${FILE_INDEX})
-            math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" ) # decrement number
-
-            break()
-          endif()
-        endforeach()
-
-        if (NOT OCCT_FILE_IN_DIR_STATUS)
-          message (STATUS "Warning. ${OCCT_FILE_IN_DIR} is not involved into ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES")
-          
-          string (REGEX MATCH ".+\\.[hlg]xx|.+\\.h$" IS_HEADER_FOUND "${OCCT_FILE_NAME}")
-          if (IS_HEADER_FOUND)
-            list (APPEND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${OCCT_FILE_NAME})
-          endif()
-        endif()
+      # create new patched file including found header
+      foreach (OCCT_HEADER_FILE ${PATCHED_OCCT_HEADER_FILES})
+        get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
+        configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
       endforeach()
-    else()
-      message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}")
-    endif()
-  endforeach()
-  
-  # create new file including found header
-  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Create header-links in inc folder...")
-
-  foreach (OCCT_HEADER_FILE ${OCCT_HEADER_FILES_COMPLETE})
-    get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
-    configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
-  endforeach()
-  
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/inc")
-  
-  string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
-  message (STATUS "Info. \(${CURRENT_TIME}\) Checking headers in inc folder...")
-    
-  file (GLOB OCCT_HEADER_FILES_OLD "${ROOT_TARGET_OCCT_DIR}/inc/*")
-  foreach (OCCT_HEADER_FILE_OLD ${OCCT_HEADER_FILES_OLD})
-    get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE_OLD} NAME)
-    string (REGEX MATCH "^[a-zA-Z0-9]+" PACKAGE_NAME "${HEADER_FILE_NAME}")
-    
-    list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
-    if (NOT ${IS_HEADER_FOUND} EQUAL -1)
-      if (NOT EXISTS "${CMAKE_SOURCE_DIR}/src/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
-        message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not presented in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
-        file (REMOVE "${OCCT_HEADER_FILE_OLD}")
-      else()
-        list (FIND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${PACKAGE_NAME} IS_HEADER_FOUND)
-        if (NOT ${IS_HEADER_FOUND} EQUAL -1)
-          message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is presented in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
-          file (REMOVE "${OCCT_HEADER_FILE_OLD}")
-        endif()
-      endif()
-    else()
-      set (IS_HEADER_FOUND -1)
-      if (NOT "${OCCT_HEADER_FILE_WITH_PROPER_NAMES}" STREQUAL "")
-        list (FIND OCCT_HEADER_FILE_WITH_PROPER_NAMES ${HEADER_FILE_NAME} IS_HEADER_FOUND)
-      endif()
-      
-      if (${IS_HEADER_FOUND} EQUAL -1)
-        message (STATUS "Warning. \(${PACKAGE_NAME}\) ${OCCT_HEADER_FILE_OLD} is not used and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
-        file (REMOVE "${OCCT_HEADER_FILE_OLD}")
-      endif()
     endif()
   endforeach()
 endmacro()
@@ -481,22 +401,3 @@ function (OCCT_VERSION OCCT_VERSION_VAR)
   set (${OCCT_VERSION_VAR} "${OCCT_VERSION_LOCALVAR}" PARENT_SCOPE)
 endfunction()
 
-macro (CHECK_PATH_FOR_CONSISTENCY THE_ROOT_PATH_NAME THE_BEING_CHECKED_PATH_NAME THE_VAR_TYPE THE_MESSAGE_OF_BEING_CHECKED_PATH)
-  
-  set (THE_ROOT_PATH "${${THE_ROOT_PATH_NAME}}")
-  set (THE_BEING_CHECKED_PATH "${${THE_BEING_CHECKED_PATH_NAME}}")
-
-  if (THE_BEING_CHECKED_PATH OR EXISTS "${THE_BEING_CHECKED_PATH}")
-    get_filename_component (THE_ROOT_PATH_ABS "${THE_ROOT_PATH}" ABSOLUTE)
-    get_filename_component (THE_BEING_CHECKED_PATH_ABS "${THE_BEING_CHECKED_PATH}" ABSOLUTE)
-
-    string (REGEX MATCH "${THE_ROOT_PATH_ABS}" DOES_PATH_CONTAIN "${THE_BEING_CHECKED_PATH_ABS}")
-
-    if (NOT DOES_PATH_CONTAIN) # if cmake found the being checked path at different place from THE_ROOT_PATH_ABS
-      set (${THE_BEING_CHECKED_PATH_NAME} "" CACHE ${THE_VAR_TYPE} "${THE_MESSAGE_OF_BEING_CHECKED_PATH}" FORCE)
-    endif()
-  else()
-    set (${THE_BEING_CHECKED_PATH_NAME} "" CACHE ${THE_VAR_TYPE} "${THE_MESSAGE_OF_BEING_CHECKED_PATH}" FORCE)
-  endif()
-
-endmacro()

adm/cmake/occt_toolkit.cmake

@@ -1,204 +1,163 @@
 # script for each OCCT toolkit
 
-# parce PACKAGES file
-if ("${PROJECT_NAME}" STREQUAL DRAWEXE)
-  set (USED_PACKAGES DRAWEXE)
-else()
-  FILE_TO_LIST ("src/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
-endif()
-
-set (PRECOMPILED_DEFS)
-
 # Get all used packages from toolkit
-foreach (OCCT_PACKAGE ${USED_PACKAGES})
-  
-  # TKService contains platform-dependent packages: Xw and WNT
-  if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
-    # do nothing
-  else()
-
-    if (WIN32)
-      list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
-    endif()
-
-    set (SOURCE_FILES)
-    set (HEADER_FILES)
-
-    # Generate Flex and Bison files
-    if (${REBUILD_PLATFORM_DEPENDENT_CODE})
-
-      # flex files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
-      list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
-
-      # bison files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
-      list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
-
-      if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
-      
-        list (SORT SOURCE_FILES_FLEX)
-        list (SORT SOURCE_FILES_BISON)
-
-        math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
-        foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
-
-          list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
-          get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
-
-          list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
-          get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
-          
-          string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
-
-          if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
-            set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
-            set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
-            BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
-            FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
-            ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
-           
-            list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
-          endif()
-        endforeach()
-      endif()
-    endif()
-
-    # header files
-    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
-
-      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
-      if(APPLE)
-        file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
-      endif()
-    else()
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
-
-      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
-      if(APPLE)
-        file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
-      endif()
-    endif()
-    
-    list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
-    list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
-    if(APPLE)
-      list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
-    endif()
-
-    foreach(HEADER_FILE ${HEADER_FILES})
-      if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        list (APPEND USED_INCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-      else()
-        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
-      endif()
-    endforeach()
-
-    foreach(SOURCE_FILE ${SOURCE_FILES})
-      if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        list (APPEND USED_SRCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-      else()
-        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
-      endif()
-    endforeach()
+foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
+  if (WIN32)
+    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
   endif()
+  # ${OCCT_SOURCE_DIR}/src/${OCCT_PACKAGE}
+
+  set (SOURCE_FILES)
+  set (HEADER_FILES)
+
+  # Generate Flex and Bison files
+  if (${REBUILD_PLATFORM_DEPENDENT_CODE})
+
+    # flex files
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
+    list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
+    list (SORT SOURCE_FILES_FLEX)
+
+    # bison files
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
+    list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
+    list (SORT SOURCE_FILES_BISON)
+
+    if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
+
+      math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
+      foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
+
+        list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
+        get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
+
+        list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
+        get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
+        
+        string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
+
+        if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
+          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
+          set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
+          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMP_DIR}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
+          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMP_DIR}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
+          ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
+
+          list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
+        endif()
+      endforeach()
+    endif()
+  endif()
+
+  # header files
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  else()
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  endif()
+  
+  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
+  list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
+  if(APPLE)
+    list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
+  endif()
+
+  foreach(HEADER_FILE ${HEADER_FILES})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      list (APPEND USED_INCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    else()
+      list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    endif()
+  endforeach()
+
+  foreach(SOURCE_FILE ${SOURCE_FILES})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      list (APPEND USED_SRCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    else()
+      list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    endif()
+  endforeach()
 endforeach()
 string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
 
-if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
-  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+# Get from toolkits EXTERNLIB all used libs
+OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
+foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
+  IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
+  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
+    list (APPEND USED_LIBS "${PROJECT_DEP}")
+  endif()
+endforeach()
 
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Release
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-else()
-  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+# Create project for toolkit
+list (FIND BUILD_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
+if ("${BUILD_TOOLKITS}" STREQUAL "" OR NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
 
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Release
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS RelWithDebInfo
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-  install (TARGETS ${PROJECT_NAME}
-           CONFIGURATIONS Debug
-           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
-  if (MSVC)
-    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+  foreach (OCCT_MODULE ${OCCT_MODULES})
+    list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
+    if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
+      set (CURRENT_MODULE ${OCCT_MODULE})
+    endif()
+  endforeach()
+  
+  if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
+    add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+    install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS Debug
              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-  endif()
-endif()
-
-set (CURRENT_MODULE)
-foreach (OCCT_MODULE ${OCCT_MODULES})
-  list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
-  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
-    set (CURRENT_MODULE ${OCCT_MODULE})
-  endif()
-endforeach()
-
-if (CURRENT_MODULE)
-  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
-endif()
-
-set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
-
-set (USED_TOOLKITS_BY_CURRENT_PROJECT)
-set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
-
-# parce EXTERNLIB file
-FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
-foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
-  string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
-  if (NOT "${TK_FOUND}" STREQUAL "")
-    list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
   else()
-    string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
-    if ("${CSF_FOUND}" STREQUAL "")
-      message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
-    else() # get CSF_ value
-      set (CURRENT_CSF ${${USED_ITEM}})
-      if (NOT "${CURRENT_CSF}" STREQUAL "")
-        # prepare a list from a string with whitespaces
-        separate_arguments (CURRENT_CSF)
-        list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
-      endif()
+    add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Release
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS RelWithDebInfo
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+    install (TARGETS ${PROJECT_NAME}
+             CONFIGURATIONS Debug
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+    if (MSVC)
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
     endif()
   endif()
-endforeach()
 
-if (APPLE)
-  list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
-  if (NOT ${IS_X11_FOUND} EQUAL -1)
-    find_package (X11 COMPONENTS X11 Xext Xmu Xi)
-    if (NOT X11_FOUND)
-      message (STATUS "Warning. X11 is not found. It's required to install The XQuartz project: http://www.xquartz.org")
-    endif()
-  endif()
-endif()
-
-target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
+  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+  target_link_libraries (${PROJECT_NAME} ${USED_LIBS})
+endif()

adm/cmake/tbb.cmake

@@ -9,6 +9,55 @@ if (NOT DEFINED 3RDPARTY_TBB_DIR)
   set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
 endif()
 
+# tbb include directory
+if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of the tbb")
+endif()
+
+# tbb library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TBB_LIBRARY OR NOT 3RDPARTY_TBB_LIBRARY_DIR)
+  set (3RDPARTY_TBB_LIBRARY "" CACHE FILEPATH "tbb library" FORCE)
+endif()
+
+# tbb library directory
+if (NOT DEFINED 3RDPARTY_TBB_LIBRARY_DIR)
+  set (3RDPARTY_TBB_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb library")
+endif()
+
+# tbb malloc library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY OR NOT 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
+  set (3RDPARTY_TBBMALLOC_LIBRARY "" CACHE FILEPATH "tbb malloc library" FORCE)
+endif()
+
+# tbb malloc library directory
+if (NOT DEFINED 3RDPARTY_TBBMALLOC_LIBRARY_DIR)
+  set (3RDPARTY_TBBMALLOC_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tbb malloc library")
+endif()
+
+# tbb shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TBB_DLL OR NOT 3RDPARTY_TBB_DLL_DIR)
+    set (3RDPARTY_TBB_DLL "" CACHE FILEPATH "tbb shared library" FORCE)
+  endif()
+endif()
+
+# tbb shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TBB_DLL_DIR)
+  set (3RDPARTY_TBB_DLL_DIR "" CACHE FILEPATH "The directory containing tbb shared library")
+endif()
+
+# tbb malloc shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL OR NOT 3RDPARTY_TBBMALLOC_DLL_DIR)
+    set (3RDPARTY_TBBMALLOC_DLL "" CACHE FILEPATH "tbb malloc shared library" FORCE)
+  endif()
+endif()
+
+# tbb malloc shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
+  set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
+endif()
+
 if (MSVC)
   add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
   add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
@@ -17,260 +66,184 @@ endif()
 # include occt macros. compiler_bitness, os_wiht_bit, compiler
 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
-# specify TBB folder in connectin with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_TBB_DIR PATH "The directory containing tbb")
+# search for product directory inside 3RDPARTY_DIR directory
+if (NOT 3RDPARTY_TBB_DIR AND 3RDPARTY_DIR)
+  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" "TBB" TBB_DIR_NAME)
+  if (TBB_DIR_NAME)
+    message (STATUS "Info: TBB: ${TBB_DIR_NAME} folder is used")
+    set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+  endif()
+endif()
 
-  if (NOT 3RDPARTY_TBB_DIR OR NOT EXISTS "${3RDPARTY_TBB_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-    if (TBB_DIR_NAME)
-      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+OCCT_MAKE_COMPILER_BITNESS()
+
+if (${COMPILER_BITNESS} STREQUAL 32)
+  set (TBB_ARCH_NAME ia32)
+else()
+  set (TBB_ARCH_NAME intel64)
+endif()
+
+# search for include directory in defined 3rdparty directory
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
+  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include" NO_DEFAULT_PATH)
+  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
+endif()
+
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
+endif()
+
+OCCT_MAKE_COMPILER_SHORT_NAME()
+
+# TBB_COMPILER_FOLER
+#if (WIN32)
+  set (TBB_COMPILER_FOLER ${COMPILER})
+#else()
+#  set (TBB_COMPILER_FOLER ${COMPILER})
+#endif()
+
+# search for tbb and tbb malloc library in defined 3rdparty directory
+foreach (LIBRARY_NAME TBB TBBMALLOC)
+  if (NOT WIN32)
+    file (GLOB TBB_SUBDIRS RELATIVE ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/ ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/*)
+    list (SORT TBB_SUBDIRS)
+    list (REVERSE TBB_SUBDIRS)
+    list (LENGTH TBB_SUBDIRS TBB_SUBDIRS_LENGTH)
+    set (TBB_SUBDIR_FIRST "")
+    if (${TBB_SUBDIRS_LENGTH})
+      list (GET TBB_SUBDIRS 0 TBB_SUBDIR_FIRST)
+      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_SUBDIR_FIRST}")
     endif()
   endif()
-else()
-  #set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing TBB" FORCE)
-endif()
-
-if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-endif()
-
-if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-    # check 3RDPARTY_TBB_INCLUDE_DIR for consictency with specified 3RDPARTY_TBB_DIR
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_TBB_INCLUDE_DIR PATH "The directory containing headers of the TBB")
-endif()
-
-# tbb.h
-if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
-
-  set (HEADER_NAMES tbb.h tbb/tbb.h)
-
-  # set 3RDPARTY_TBB_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_TBB_INCLUDE_DIR
-  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to tbb.h" FORCE)
-
-  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_TBB_DIR}
-                                              PATH_SUFFIXES include
-                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
-  else()
-    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
+  elseif (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
+    if (NOT "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR_TMP}")
+      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
+    endif()
   endif()
-endif()
 
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "3RDPARTY_${LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of ${LIBRARY_NAME}" FORCE)
+
+    string (TOLOWER "${LIBRARY_NAME}" lower_LIBRARY_NAME)
+    find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${lower_LIBRARY_NAME} PATHS
+                                                                         "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
+                                                                         "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                                                         NO_DEFAULT_PATH)
+
+      # second search if previous one do not find anything
+      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME})
+  endif()
+
+  if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
+    get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
+  endif()
+  set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
+
+  # search for dll in defined 3rdparty directory (just for win case)
+  if (WIN32)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
+      set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
+    elseif (3RDPARTY_${LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
+      if (NOT "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" STREQUAL "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR_TMP}")
+        set (3RDPARTY_${LIBRARY_NAME}_DLL "" CACHE FILEPATH "${LIBRARY_NAME} shared library" FORCE)
+      endif()
+    endif()
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      set (3RDPARTY_${LIBRARY_NAME}_DLL "3RDPARTY_${LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of ${LIBRARY_NAME}" FORCE)
+
+      find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME} PATHS
+                                                                 "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}"
+                                                                 "${3RDPARTY_TBB_DIR}/bin/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                                                 NO_DEFAULT_PATH)
+
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME})
+    endif()
+
+    if (NOT 3RDPARTY_${LIBRARY_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}")
+      get_filename_component(3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL}" PATH)
+      set (3RDPARTY_${LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} shared library" FORCE)
+    endif()
+  endif() # end dll search
+endforeach() # end tbb / tbbmalloc
+
+# include found paths to common variables
 if (3RDPARTY_TBB_INCLUDE_DIR AND EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
   list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
 else()
   list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-
-  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "the path to tbb.h" FORCE)
 endif()
 
-# common steps for tbb and tbbmalloc
-macro (TBB_PRODUCT_SEARCH PRODUCT_NAME)
-
-  string (TOLOWER ${PRODUCT_NAME} lower_PRODUCT_NAME)
-
-  # define required tbb/tbbmalloc variables
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "${PRODUCT_NAME} library" FORCE)
-  endif()
-
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} library")
+foreach (LIBRARY_NAME TBB TBBMALLOC)
+  if (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
   endif()
 
   if (WIN32)
-    if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
-      set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-    endif()
-  endif()
-
-  if (WIN32 AND NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library")
-  endif()
-
-  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_TBB_DIR
-  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY FILEPATH "the path to ${PRODUCT_NAME} library")
-
-    if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
+    if (3RDPARTY_${LIBRARY_NAME}_DLL OR EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}")
     else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR PATH "The directory containing ${PRODUCT_NAME} library")
-    endif()
-
-    if (WIN32)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${PRODUCT_NAME}_DLL FILEPATH "the path to ${PRODUCT_NAME} shared library")
-
-      if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-        get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-      else()
-
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR PATH "The directory containing ${PRODUCT_NAME} shared library")
-      endif()
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
     endif()
   endif()
+endforeach()
 
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-  OCCT_MAKE_COMPILER_BITNESS()
-
-  if (${COMPILER_BITNESS} EQUAL 32)
-    set (${PRODUCT_NAME}_ARCH_NAME ia32)
-  else()
-    set (${PRODUCT_NAME}_ARCH_NAME intel64)
-  endif()
-
-  # tbb/tbbmalloc library
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-    
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
-    set (PRODUCT_PATH_SUFFIXES lib ${lower_PRODUCT_NAME})
-
-    # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library" FORCE)
-
-    if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-      if (NOT EXISTS "${3RDPARTY_TBB_DIR}/lib/${${PRODUCT_NAME}_ARCH_NAME}/${COMPILER}")
-        if (EXISTS "${3RDPARTY_TBB_DIR}/lib/${${PRODUCT_NAME}_ARCH_NAME}")
-          file (GLOB ${PRODUCT_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/lib/${${PRODUCT_NAME}_ARCH_NAME}/*")
-          if (${PRODUCT_NAME}_COMPILER_LIST)
-            list (GET ${PRODUCT_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
-            if (THE_MOST_FRESH_COMPILER_VERSION)
-              get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
-              set (PRODUCT_PATH_SUFFIXES lib ${lower_PRODUCT_NAME} lib/${${PRODUCT_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
-            endif()
-          endif()
-        endif()
-      else()
-        set (PRODUCT_PATH_SUFFIXES lib ${lower_PRODUCT_NAME} lib/${${PRODUCT_NAME}_ARCH_NAME}/${COMPILER})
-      endif()
-
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${lower_PRODUCT_NAME}
-                                         PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" "${3RDPARTY_TBB_DIR}"
-                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    else()
-      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${lower_PRODUCT_NAME} 
-                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
-                                         CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
-
-    if (3RDPARTY_${PRODUCT_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}")
-      get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-    else()
-      set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-    endif()
-  endif()
-
-  if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
-
-    set (3RDPARTY_${PRODUCT_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library" FORCE)
-  endif()
-
-  # tbb/tbbmalloc shared library
-  if (WIN32)
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-      set (PRODUCT_PATH_SUFFIXES bin)
-
-      # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
-      set (3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-
-      if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-        if (NOT EXISTS "${3RDPARTY_TBB_DIR}/bin/${${PRODUCT_NAME}_ARCH_NAME}/${COMPILER}")
-          if (EXISTS "${3RDPARTY_TBB_DIR}/bin/${${PRODUCT_NAME}_ARCH_NAME}")
-            file (GLOB ${PRODUCT_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/bin/${${PRODUCT_NAME}_ARCH_NAME}/*")
-            if (${PRODUCT_NAME}_COMPILER_LIST)
-              list (GET ${PRODUCT_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
-              if (THE_MOST_FRESH_COMPILER_VERSION)
-                get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
-                set (PRODUCT_PATH_SUFFIXES bin bin/${${PRODUCT_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
-              endif()
-            endif()
-          endif()
-        else()
-          set (PRODUCT_PATH_SUFFIXES bin bin/${${PRODUCT_NAME}_ARCH_NAME}/${COMPILER})
-        endif()
-
-        if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
-          find_library (3RDPARTY_${PRODUCT_NAME}_DLL ${lower_PRODUCT_NAME}
-                                         PATHS "${3RDPARTY_TBB_DIR}"
-                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
-                                         NO_DEFAULT_PATH)
-        else()
-          find_library (3RDPARTY_${PRODUCT_NAME}_DLL ${lower_PRODUCT_NAME} PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES})
-        endif()
-
-        if (3RDPARTY_${PRODUCT_NAME}_DLL AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
-          get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${PRODUCT_NAME} library" FORCE)
-        else()
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library" FORCE)
-
-          set (3RDPARTY_${PRODUCT_NAME}_DLL "" CACHE FILEPATH "${PRODUCT_NAME} shared library" FORCE)
-        endif()
-      endif()
-    endif()
-
-    if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
-    else()
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
-    endif()
-  endif()
-
-  # install tbb/tbbmalloc
-  if (INSTALL_${PRODUCT_NAME})
-    OCCT_MAKE_OS_WITH_BITNESS()
-    OCCT_MAKE_COMPILER_SHORT_NAME()
-
-    if (WIN32)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-    else()
-      get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
-
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
-      install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-               RENAME ${PRODUCT_LIBRARY_NAME}.2)
-    endif()
-  endif()
-  mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY 3RDPARTY_${PRODUCT_NAME}_DLL)
-endmacro()
-
-
-TBB_PRODUCT_SEARCH (TBB)
-TBB_PRODUCT_SEARCH (TBBMALLOC)
-
-
+# install tbb
 if (INSTALL_TBB)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+
+  if (WIN32)
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+    install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  else()
+    get_filename_component(TBBLIB ${3RDPARTY_TBB_LIBRARY} NAME)
+    get_filename_component(TBBMALLOCLIB ${3RDPARTY_TBBMALLOC_LIBRARY} NAME)
+
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBLIB}.2)
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+             RENAME ${TBBLIB}.2)
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             RENAME ${TBBLIB}.2)
+
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+             RENAME ${TBBMALLOCLIB}.2)
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+             RENAME ${TBBMALLOCLIB}.2)
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+             RENAME ${TBBMALLOCLIB}.2)
+  endif()
+
   set (USED_3RDPARTY_TBB_DIR "")
 else()
   # the library directory for using by the executable
@@ -280,3 +253,5 @@ else()
     set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
   endif()
 endif()
+
+mark_as_advanced (3RDPARTY_TBB_LIBRARY 3RDPARTY_TBBMALLOC_LIBRARY 3RDPARTY_TBB_DLL 3RDPARTY_TBBMALLOC_DLL)

adm/cmake/tcl.cmake

@@ -77,7 +77,7 @@ endif()
 
 if (WIN32)
   if (NOT 3RDPARTY_TCL_DLL)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
     set (DLL_FOLDER_FOR_SEARCH "")
     if (3RDPARTY_TCL_DLL_DIR)
@@ -142,7 +142,7 @@ endif()
 
 if (WIN32)
   if (NOT 3RDPARTY_TCL_DLL)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
     set (DLL_FOLDER_FOR_SEARCH "")
     if (3RDPARTY_TCL_DLL_DIR)
@@ -247,15 +247,10 @@ endif()
 mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TCL_DLL)
 
 if (TK_FOUND AND 3RDPARTY_TCL_DIR)
-
-  get_filename_component (TK_WISH_ABSOLUTE          "${TK_WISH}"          ABSOLUTE)
-  get_filename_component (3RDPARTY_TCL_DIR_ABSOLUTE "${3RDPARTY_TCL_DIR}" ABSOLUTE)
-
-  string (FIND "${TK_WISH_ABSOLUTE}" "${3RDPARTY_TCL_DIR_ABSOLUTE}" THE_SAME_FOLDER)
-
-  if (${THE_SAME_FOLDER} EQUAL 0)
+  get_filename_component (3RDPARTY_TK_WISH_DIR "${TK_WISH}" PATH)
+  get_filename_component (3RDPARTY_TK_WISH_DIR_PARENT "${3RDPARTY_TK_WISH_DIR}" PATH)
+  if ("${3RDPARTY_TK_WISH_DIR_PARENT}" STREQUAL "${3RDPARTY_TCL_DIR}")
     set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
-    message (STATUS "Info. TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
   endif()
 endif()
 

adm/cmake/vardescr.cmake

@@ -44,7 +44,7 @@ INSTALL_MESSAGE (INSTALL_GL2PS            "GL2PS binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
-#INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
+INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
 
 # build variables
 macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)

adm/cmake/vtk.cmake

@@ -1,207 +1,183 @@
 # vtk
 
-#if (NOT DEFINED INSTALL_VTK)
-#  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
-#endif()
+if (NOT DEFINED INSTALL_VTK)
+  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
+endif()
 
 # vtk directory
 if (NOT DEFINED 3RDPARTY_VTK_DIR)
-  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
-endif()
-
-set (3RDPARTY_VTK_REQUIRED_LIBRARIES vtkCommonCore
-                                     vtkCommonDataModel
-                                     vtkCommonExecutionModel
-                                     vtkCommonMath
-                                     vtkCommonTransforms
-                                     vtkRenderingCore
-                                     vtkRenderingFreeType
-                                     vtkRenderingFreeTypeOpenGL
-                                     vtkRenderingOpenGL
-                                     vtkFiltersGeneral
-                                     vtkIOCore
-                                     vtkIOImage
-                                     vtkImagingCore
-                                     vtkInteractionStyle)
-
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
-# specify VTK folder in connectin with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
-
-  if (NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" VTK VTK_DIR_NAME)
-    if (VTK_DIR_NAME)
-      set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing VTK" FORCE)
-    endif()
-  endif()
-else()
-  #set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK" FORCE)
+  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing vtk")
 endif()
 
 # vtk include directory
 if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
-  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
+  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of vtk")
 endif()
 
 # vtk library directory
 if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
-  set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
+  set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing vtk library")
 endif()
 
 # vtk dll directory
 if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
-  set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
+  set (3RDPARTY_VTK_DLL_DIR "" CACHE FILEPATH "The directory containing VTK dll")
 endif()
 
-# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_INCLUDE_DIR PATH "The directory containing headers of VTK")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_LIBRARY_DIR PATH "The directory containing VTK libraries")
-
-  if (WIN32)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_DLL_DIR PATH "The directory containing VTK shared library")
+# search for vtk in user defined directory
+if (NOT 3RDPARTY_VTK_DIR AND 3RDPARTY_DIR)
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" vtk VTK_DIR_NAME)
+  if (VTK_DIR_NAME)
+    set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing vtk product" FORCE)
   endif()
 endif()
 
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  set (CACHED_VTK_DIR $ENV{VTK_DIR})
-  set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
-endif()
-
+# find installed vtk
 find_package(VTK QUIET)
 
+# find native vtk
+if (NOT VTK_FOUND)
+  find_package(VTK QUIET PATHS "${3RDPARTY_VTK_DIR}")
+endif()
+
+if (NOT VTK_FOUND AND NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
+  message(SEND_ERROR "VTK not found. Set the 3RDPARTY_VTK_DIR cmake cache entry to the directory containing VTK.")
+  set (3RDPARTY_VTK_DIR "3RDPARTY_VTK_DIR-NOTFOUND" CACHE PATH "The directory containing vtk product" FORCE)
+endif()
+
+set(VTK_VERSION "")
 if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
-endif()
-
-if (VTK_FOUND)
-
-  # add compiler flags, preprocessor definitions, include and link dirs
-  include (${VTK_USE_FILE})
-
-  set (ALL_REQUIRED_VTK_LIBRARIES_FOUND ON)
-  if (VTK_LIBRARIES)
-
-    set (3RDPARTY_VTK_INCLUDE_DIRS)
-    set (3RDPARTY_VTK_LIBRARY_DIRS)
-    set (3RDPARTY_VTK_DLL_DIRS)
-
-    foreach (VTK_REQUIRED_LIBRARY ${3RDPARTY_VTK_REQUIRED_LIBRARIES})
-      list (FIND VTK_LIBRARIES ${VTK_REQUIRED_LIBRARY} FOUND_INDEX)
-      if (${FOUND_INDEX} EQUAL -1)
-        message (WARNING "VTK: required ${VTK_REQUIRED_LIBRARY} library is not found")
-        set (ALL_REQUIRED_VTK_LIBRARIES_FOUND OFF)
-      else()
-        # get paths from corresponding variables
-        if (${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS}")
-          list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_REQUIRED_LIBRARY}_INCLUDE_DIRS}")
-        endif()
-
-        if (${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS}")
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_REQUIRED_LIBRARY}_LIBRARY_DIRS}")
-        endif()
-
-        if (${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-          list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-          if (NOT WIN32)
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_REQUIRED_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-          endif()
-        endif()
-
-        # get paths from corresponding properties
-        get_property (TARGET_VTK_IMPORT_CONFS TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_CONFIGURATIONS)
-
-        if (TARGET_VTK_IMPORT_CONFS)
-          list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-          
-          # todo: choose configuration in connection with the build type
-          #if (CMAKE_BUILD_TYPE)
-          #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
-          #  endforeach()
-          #endif()
-
-          get_property (TARGET_PROPERTY_IMP_PATH TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
-          if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
-            get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
-          endif()
-
-          get_property (TARGET_PROPERTY_LOCATION_PATH TARGET ${VTK_REQUIRED_LIBRARY} PROPERTY IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
-          if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
-            get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
-
-            if (WIN32)
-              list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-            else()
-              list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-            endif()
-          endif()
-        endif()
-      endif()
-      
-    endforeach()
-  else()  
-    set (ALL_REQUIRED_VTK_LIBRARIES_FOUND OFF)
+  get_filename_component(3RDPARTY_VTK_DIR_NAME "${3RDPARTY_VTK_DIR}" NAME)
+  string(REGEX MATCH "^VTK-([0-9].[0-9])" VTK_VERSION "${3RDPARTY_VTK_DIR_NAME}")
+  set(VTK_VERSION "${CMAKE_MATCH_1}")
+  if (NOT 3RDPARTY_VTK_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
+    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_DIR}/include/vtk-${VTK_VERSION}" CACHE FILEPATH "The directory containing includes of VTK" FORCE)
   endif()
-
-  if (ALL_REQUIRED_VTK_LIBRARIES_FOUND)
-
-    if (3RDPARTY_VTK_INCLUDE_DIRS)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
-      list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
-
-      list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
-      set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
-    endif()
-
-    if (3RDPARTY_VTK_LIBRARY_DIRS)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
-
-      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
-      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
-    endif()
-
-    if (WIN32)
-      if (3RDPARTY_VTK_DLL_DIRS)
-        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
-        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
-
-        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
-        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
-      endif()
+  if (NOT 3RDPARTY_VTK_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
+    if(EXISTS "${3RDPARTY_VTK_DIR}/lib")
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
+    elseif (EXISTS "${3RDPARTY_VTK_DIR}/lib")
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
     endif()
   endif()
+  if(3RDPARTY_VTK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_VTK_LIBRARY_DIR}")
+  endif()
 endif()
 
+# vtk libraries
+# lib
+set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.lib vtkCommonDataModel-${VTK_VERSION}.lib vtkCommonExecutionModel-${VTK_VERSION}.lib
+                       vtkCommonMath-${VTK_VERSION}.lib vtkCommonTransforms-${VTK_VERSION}.lib vtkRenderingCore-${VTK_VERSION}.lib
+                       vtkRenderingOpenGL-${VTK_VERSION}.lib vtkFiltersGeneral-${VTK_VERSION}.lib vtkIOCore-${VTK_VERSION}.lib
+                       vtkIOImage-${VTK_VERSION}.lib vtkImagingCore-${VTK_VERSION}.lib vtkInteractionStyle-${VTK_VERSION}.lib )
+
+#dll
+set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.dll
+                   vtkCommonCore-${VTK_VERSION}.dll
+                   vtkCommonDataModel-${VTK_VERSION}.dll
+                   vtkCommonExecutionModel-${VTK_VERSION}.dll
+                   vtkCommonMath-${VTK_VERSION}.dll
+                   vtkCommonMisc-${VTK_VERSION}.dll
+                   vtkCommonSystem-${VTK_VERSION}.dll
+                   vtkCommonTransforms-${VTK_VERSION}.dll
+                   vtkDICOMParser-${VTK_VERSION}.dll
+                   vtkFiltersCore-${VTK_VERSION}.dll
+                   vtkFiltersExtraction-${VTK_VERSION}.dll
+                   vtkFiltersGeneral-${VTK_VERSION}.dll
+                   vtkFiltersGeometry-${VTK_VERSION}.dll
+                   vtkFiltersSources-${VTK_VERSION}.dll
+                   vtkFiltersStatistics-${VTK_VERSION}.dll
+                   vtkIOCore-${VTK_VERSION}.dll
+                   vtkIOImage-${VTK_VERSION}.dll
+                   vtkImagingCore-${VTK_VERSION}.dll
+                   vtkImagingFourier-${VTK_VERSION}.dll
+                   vtkImagingHybrid-${VTK_VERSION}.dll
+                   vtkInteractionStyle-${VTK_VERSION}.dll
+                   vtkRenderingCore-${VTK_VERSION}.dll
+                   vtkRenderingOpenGL-${VTK_VERSION}.dll
+                   vtkalglib-${VTK_VERSION}.dll
+                   vtkjpeg-${VTK_VERSION}.dll
+                   vtkmetaio-${VTK_VERSION}.dll
+                   vtkpng-${VTK_VERSION}.dll
+                   vtksys-${VTK_VERSION}.dll
+                   vtktiff-${VTK_VERSION}.dll
+                   vtkzlib-${VTK_VERSION}.dll )
+
+# search for dll directory
+if (WIN32)
+  if (NOT 3RDPARTY_VTK_DLL_DIR OR NOT EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+    if(EXISTS "${3RDPARTY_VTK_DIR}/bin")
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+    elseif (EXISTS "${3RDPARTY_VTK_DIR}/bind")
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bind" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+    endif()
+  endif()
+
+  if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_VTK_DLL_DIR}")
+  endif()
+endif() 
+
+OCCT_CHECK_AND_UNSET(VTK_DIR)
+
 if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_VTK_INCLUDE_DIR}")
 else()
   list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
 endif()
 
-if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
-  list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
-else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_LIBRARY_DIR)
-endif()
+if (INSTALL_VTK)
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  if (WIN32)
+    if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+      foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
+        set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE)
+        find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH)
+        if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}")
+          list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}")
+        else()
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS Release
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS RelWithDebInfo
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+          install (FILES ${3RDPARTY_VTK_DLL}
+                   CONFIGURATIONS Debug
+                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+        endif()
+      endforeach()
+      OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL)
+    endif()
+  else ()
+    foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
+      string(REPLACE ".dll" ".so.1" VTK_DLL_NAME "${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS Release
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+              RENAME "lib${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS RelWithDebInfo
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+              RENAME "lib${VTK_DLL_NAME}")
+      install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
+              CONFIGURATIONS Debug
+              DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+              RENAME "lib${VTK_DLL_NAME}")
+    endforeach()
+  endif()
 
-if (WIN32)
-  if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
-    list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
+  set (USED_3RDPARTY_VTK_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
   else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_DLL_DIR)
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
   endif()
 endif()
 
-# the library directory for using by the executable
-if (WIN32)
-  set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
-else()
-  set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
-endif()
-
 mark_as_advanced (VTK_INCLUDE_DIRS VTK_LIBRARY_DIRS VTK_DIR)

adm/templates/env.bat

@@ -22,6 +22,7 @@ set "HAVE_TBB=false"
 set "HAVE_OPENCL=false"
 set "HAVE_FREEIMAGE=false"
 set "HAVE_GL2PS=false"
+set "HAVE_OPENCL=false"
 set "HAVE_VTK=false"
 set "HAVE_D3D=false"
 set "CSF_OPT_INC="

adm/upgrade.tcl

@@ -477,77 +477,6 @@ proc ConvertTColFwd {thePackagePath theHeaderExtensions} {
   }
 }
 
-# try to find source file corresponding to the specified header and either
-# inject macro IMPLEMENT_STANDARD_RTTIEXT in it, or check it already present,
-# and depending on this, return suffix to be used for corresponding macro
-# DEFINE_STANDARD_RTTI... (either inline or out-of-line variant)
-proc DefineExplicitRtti {hxxfile class base theSourceExtensions} {
-  # if current file is not a header (by extension), exit with "inline" variant
-  # (there is no need to bother with out-of-line instantiations for local class)
-  set ext [string range [file extension $hxxfile] 1 end]
-  if { [lsearch -exact [split $theSourceExtensions ,] $ext] >=0 } {
-    return "_INLINE"
-  }
-
-  # try to find source file with the same name but source-type extension 
-  # in the same folder
-  set filename [file rootname $hxxfile]
-  foreach ext [split $theSourceExtensions ,] {
-#    puts "Checking ${filename}.$ext"
-    if { ! [file readable ${filename}.$ext] } { continue }
-
-    # check the file content
-    set aFileContent [ReadFileToList ${filename}.$ext aFileRawContent aEOL]
-
-    # try to find existing macro IMPLEMENT_STANDARD_RTTIEXT and check that 
-    # it is consistent
-    foreach line $aFileContent {
-      if { [regexp {^\s*IMPLEMENT_STANDARD_RTTIEXT\s*\(\s*$class\s*,\s*([A-Za-z]+)\s*\)} $line res impl_base] } {
-        # implementation is in place, just report warning if second argument
-        # is different
-        if { $base != $impl_base } {
-          logwarn "Warning in ${filename}.$ext: second argument of macro"
-          logwarn "        IMPLEMENT_STANDARD_RTTIEXT($class,$impl_base)"
-          logwarn "        is not the same as detected base class, $base"
-        }
-        return "EXT"
-      }
-    }
-
-    # inject a new macro before the first non-empty, non-comment, and 
-    # non-preprocessor line
-    set aNewFileContent {}
-    set injected 0
-    set inc_found 0
-    foreach line $aFileContent {
-      if { ! $injected } {
-        # add macro before first non-empty line after #includes
-        if { [regexp {^\s*$} $line] } {
-        } elseif { [regexp {^\s*\#\s*include} $line] } {
-          set inc_found 1
-        } elseif { $inc_found } {
-          set injected 1
-          lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
-          if { ! [regexp "^IMPLEMENT_" $line] } {
-            lappend aNewFileContent ""
-          }
-        }
-      }
-      lappend aNewFileContent $line
-    }
-    if { ! $injected } {
-      lappend aNewFileContent "IMPLEMENT_STANDARD_RTTIEXT($class,$base)"
-    }
-    SaveListToFile ${filename}.$ext $aNewFileContent $aEOL
-
-    return "EXT"
-  }
-
-  logwarn "Warning in ${hxxfile}: cannot find corresponding source file,"
-  logwarn "           will use inline version of DEFINE_STANDARD_RTTI"
-  return "_INLINE"
-}
-
 # Parse source files and:
 #
 # - add second argument to macro DEFINE_STANDARD_RTTI specifying first base 
@@ -592,7 +521,7 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
 
     # find all instances of DEFINE_STANDARD_RTTI with single or two arguments
     set index 0
-    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI)\s*\(\s*([A-Za-z_0-9,\s]+)\s*\)}
+    set pattern_rtti {^(\s*DEFINE_STANDARD_RTTI\s*)\(\s*([A-Za-z_0-9,\s]+)\s*\)}
     while { [regexp -start $index -indices -lineanchor $pattern_rtti \
                     $aProcessedFileContent location start clist] } {
       set index [lindex $location 1]
@@ -609,12 +538,7 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
               logwarn "macro DEFINE_STANDARD_RTTI is changed assuming it inherits $inherits($class), please check!"
             }
             set change_flag 1
-            # try to inject macro IMPLEMENT_STANDARD_RTTIEXT in the 
-            # corresponding source file (or check it already present),
-            # and depending on this, use either inline or out-of-line variant
-            set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $inherits($class) $theSourceExtensions]
-            ReplaceSubString aProcessedFileContent $location \
-                             "${start}${rtti_suffix}($class,$inherits($class))" index
+            ReplaceSubString aProcessedFileContent $location "${start}($class, $inherits($class))" index
           }
         } else {
           logwarn "Error in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file, cannot fix"
@@ -626,16 +550,11 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
           logwarn "Warning in $aProcessedFile: Macro DEFINE_STANDARD_RTTI used for class $class whose declaration is not found in this file"
         } elseif { $base != $inherits($class) } {
           logwarn "Warning in $aProcessedFile: Second argument in macro DEFINE_STANDARD_RTTI for class $class is $base while $class seems to inherit from $inherits($class)"
-          if { ! [info exists inherits($class,multiple)] } {
-            set base $inherits($class)
+          if { ! $theCheckMode && ! [info exists inherits($class,multiple)] } {
+            set change_flag 1
+            ReplaceSubString aProcessedFileContent $location "${start}($class, $inherits($class))" index
           }
         }
-        if { ! $theCheckMode } {
-          set change_flag 1
-          set rtti_suffix [DefineExplicitRtti $aProcessedFile $class $base $theSourceExtensions]
-          ReplaceSubString aProcessedFileContent $location \
-                           "${start}${rtti_suffix}($class,$base)" index
-        }
       }
     }
 
@@ -659,12 +578,8 @@ proc ConvertRtti {theProcessedPath theIncPaths theCheckMode theCompatibleMode \
       set index 0
       set first_newline \n\n
       set pattern_implement {\\?\n\s*IMPLEMENT_(DOWNCAST|STANDARD_[A-Z_]+|HARRAY1|HARRAY2|HUBTREE|HEBTREE|HSEQUENCE)\s*\([A-Za-z0-9_ ,]*\)\s*;?}
-      while { [regexp -start $index -indices -lineanchor $pattern_implement $aProcessedFileContent location macro] } {
+      while { [regexp -start $index -indices -lineanchor $pattern_implement $aProcessedFileContent location] } {
         set index [lindex $location 1]
-        # macro IMPLEMENT_STANDARD_RTTIEXT is retained
-        if { [eval string range \$aProcessedFileContent $macro] == "STANDARD_RTTIEXT" } {
-          continue
-        }
         if { ! $theCheckMode } {
           set change_flag 1
           ReplaceSubString aProcessedFileContent $location $first_newline index
@@ -1166,11 +1081,10 @@ proc ReadFileToList {theFilePath theFileContent theFileEOL} {
     regsub -all {$aFileEOL} $aFileContent "\n" aFileContent
   }
 
-  set aList [split $aFileContent "\n"]
-#  set aList {}
-#  foreach aLine [split $aFileContent "\n"] {
-#    lappend aList [string trimright $aLine]
-#  }
+  set aList {}
+  foreach aLine [split $aFileContent "\n"] {
+    lappend aList [string trimright $aLine]
+  }
 
   return $aList
 }
@@ -1240,8 +1154,6 @@ proc SaveListToFile {theFilePath theData {theEOL "auto"}} {
   fconfigure $aFile -translation binary
   puts -nonewline $aFile [join $theData $anUsedEol]
   close $aFile
-
-  loginfo "File $theFilePath modified"
 }
 
 # collect all subdirs of theBaseDir

dox/dev_guides/building/android/android.md

@@ -1,21 +1,19 @@
-Building with CMake for Android {#occt_dev_guides__building_android}
+Building with CMake and ADT for Android {#occt_dev_guides__building_android}
 ===================
 
 @tableofcontents
 
-This article describes the steps to build OCCT libraries for Android from a complete source package
-with GNU make (makefiles) on Windows 7 and Ubuntu 15.10.
+This file describes the steps to build OCCT libraries from a complete source package
+with following tools:
+  - Generation of eclipse project files
+    - CMake v3.0+ http://www.cmake.org/cmake/resources/software.html
+    - Cross-compilation toolchain for CMake https://github.com/taka-no-me/android-cmake
+    - Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
+    - Make: MinGW v4.82+ for Windows, GNU Make vXX for Linux. http://sourceforge.net/projects/mingw/files/
+  - Building eclipse project files of OCCT
+    - Android Developer Tools (ADT) v22+ https://developer.android.com/sdk/index.html
 
-The steps on Windows and Ubuntu are similar. There is the only one difference: makefiles are built with mingw32-make
-on Windows and native GNU make on Ubuntu.
-
-Required tools (download and install if it is required):
-  - CMake v3.0+ http://www.cmake.org/cmake/resources/software.html
-  - Cross-compilation toolchain for CMake https://github.com/taka-no-me/android-cmake
-  - Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
-  - GNU Make: MinGW v4.82+ for Windows (http://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu. 
-  
-## Generation of makefiles
+## Generation of eclipse project files
 Run GUI tool provided by CMake: cmake-gui
 
 ### Tools configuration
@@ -24,23 +22,21 @@ Run GUI tool provided by CMake: cmake-gui
 
 @figure{/dev_guides/building/android/images/android_image001.png}
 
-Click **Configure** button. It opens the window with a drop-down list of generators supported by CMake project.
+Click **Configure** button. It opens the window with a drop-down list of generators supported by CMake project. - 
 
-Select "MinGW MakeFiles" item from the list
+Select "Eclipse CDT4 - MinGW MakeFiles" item from the list
   - Choose "Specify toolchain file for cross-compiling"
   - Click "Next"
 @figure{/dev_guides/building/android/images/android_image002.png}
-
-  - Specify a toolchain file at the next dialog by android.toolchain.cmake . It is contained by cross-compilation toolchain for CMake
+  - Specify the Toolchain file at next dialog by android.toolchain.cmake is contained by cross-compilation toolchain for CMake
   - Click "Finish"
 @figure{/dev_guides/building/android/images/android_image003.png}
 
-If ANDROID_NDK environment variable is not defined in current OS, add cache entry ANDROID_NDK (entry type is PATH) - path to the NDK folder ("Add Entry" button)
+Add cache entry ANDROID_NDK - path (entry type is PATH) to the NDK folder ("Add Entry" button)
 @figure{/dev_guides/building/android/images/android_image004.png}
 
-If on Windows the message is appeared: "CMake Error: CMake was unable to find a build program corresponding to "MinGW Makefiles"
-CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.",
-specify **CMAKE_MAKE_PROGRAM** to mingw32-make executable.
+if there is message "CMake Error: CMake was unable to find a build program corresponding to "MinGW Makefiles".  CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool."  
+Define CMAKE_MAKE_PROGRAM variable with the file path to mingw32-make executable. 
 @figure{/dev_guides/building/android/images/android_image005.png}
 
 ### OCCT Configuration
@@ -49,36 +45,27 @@ How to configure OCCT, see "OCCT Configuration" section of @ref occt_dev_guides_
 taking into account the specific configuration variables for android:
   - ANDROID_ABI = armeabi-v7a
   - ANDROID_NATIVE_API_LEVEL = 15
-  - ANDROID_NDK_LAYOUT is equal to CMAKE_BUILD_TYPE variable
-  - **BUILD_MODULE_Draw = OFF**
+  - ANDROID_NDK_LAYOUT is equal to BUILD_CONFIGURATION variable 
+  - CMAKE_ECLIPSE_VERSION is equal to installed eclipse version (e.g., 4.2)
+
+Configure parallel building:
+  - CMAKE_ECLIPSE_MAKE_ARGUMENTS = -jN where N = your numbers of CPU cores (threads)
 
 @figure{/dev_guides/building/android/images/android_image006.png}
 
-### Generation of makefiles
+### Generation of eclipse projects files
 
 Click **Generate** button and wait until the generation process is finished. 
-Then makefiles will appear in the build folder (e.g. <i> D:/tmp/occt-android </i>).
+Then the eclipse project files will appear in the build folder (e.g. <i> D:/android-build-eclipse-api-15 </i>).
 
-## Building makefiles of OCCT
+## Building eclipse project files of OCCT
 
-Open console and go to the build folder. Type "mingw32-make" (Windows) or "make" (Ubuntu) to start build process.
-
-> mingw32-make
-or
-> make
-
-
-Parallel building can be started with using **"-jN"** argument of "mingw32-make/make", where N is the number of building threads.
-
-> mingw32-make -j4
-or
-> make -j4
-
-## Install built OCCT libraries
-
-Type "mingw32-make/make" with argument "install" to place the libraries 
-to the install folder (see "OCCT Configuration" section of @ref occt_dev_guides__building_cmake "Building with CMake")
-
-> mingw32-make install
-or
-> make install
+  - Open eclipse (downloaded ADT bundle contains it)
+  @figure{/dev_guides/building/android/images/android_image007.png}
+  - Import "Existing project into Workspace"
+  @figure{/dev_guides/building/android/images/android_image008.png}
+  @figure{/dev_guides/building/android/images/android_image009.png}
+  - Build ALL
+  @figure{/dev_guides/building/android/images/android_image010.png}
+  
+When the building process has finished, libraries are located in \<build folder\>/out (e.g. <i> D:/android-build-eclipse-api-15/out </i>).

dox/dev_guides/building/building.md

@@ -17,7 +17,7 @@ you need to:
 2. Build using your preferred build tool.
    - \subpage occt_dev_guides__building_automake "Building on Linux with Autotools"
    - \subpage occt_dev_guides__building_cmake "Building with CMake (cross-platform)"
-   - \subpage occt_dev_guides__building_android "Building with CMake for Android (cross-platform)"
+   - \subpage occt_dev_guides__building_android "Building with CMake and ADT for Android (cross-platform)"
    - \subpage occt_dev_guides__building_code_blocks "Building on Mac OS X with Code::Blocks"
    - \subpage occt_dev_guides__building_msvc "Building on Windows with MS Visual Studio"
    - \subpage occt_dev_guides__building_xcode "Building on Mac OS X with Xcode"

samples/qt/Common/src/OcctWindow.cxx

@@ -1,168 +0,0 @@
-#include <OcctWindow.h>
-
-// =======================================================================
-// function : OcctWindow
-// purpose  :
-// =======================================================================
-OcctWindow::OcctWindow ( QWidget* theWidget, const Quantity_NameOfColor theBackColor )
-: Aspect_Window(), 
-  myWidget( theWidget )
-{
-  SetBackground (theBackColor);
-  myXLeft   = myWidget->rect().left();
-  myYTop    = myWidget->rect().top();
-  myXRight  = myWidget->rect().right();
-  myYBottom = myWidget->rect().bottom();
-}
-
-// =======================================================================
-// function : Destroy
-// purpose  :
-// =======================================================================
-void OcctWindow::Destroy()
-{
-  myWidget = NULL;
-}
-
-// =======================================================================
-// function : NativeParentHandle
-// purpose  :
-// =======================================================================
-Aspect_Drawable OcctWindow::NativeParentHandle() const
-{
-  QWidget* aParentWidget = myWidget->parentWidget();
-  if ( aParentWidget != NULL )
-    return (Aspect_Drawable)aParentWidget->winId();
-  else
-    return 0;
-}
-
-// =======================================================================
-// function : NativeHandle
-// purpose  :
-// =======================================================================
-Aspect_Drawable OcctWindow::NativeHandle() const
-{
-  return (Aspect_Drawable)myWidget->winId();
-}
-
-// =======================================================================
-// function : IsMapped
-// purpose  :
-// =======================================================================
-Standard_Boolean OcctWindow::IsMapped() const
-{
-  return !( myWidget->isMinimized() || myWidget->isHidden() );
-}
-
-// =======================================================================
-// function : Map
-// purpose  :
-// =======================================================================
-void OcctWindow::Map() const
-{
-  myWidget->show();
-  myWidget->update();
-}
-
-// =======================================================================
-// function : Unmap
-// purpose  :
-// =======================================================================
-void OcctWindow::Unmap() const
-{
-  myWidget->hide();
-  myWidget->update();
-}
-
-// =======================================================================
-// function : DoResize
-// purpose  :
-// =======================================================================
-Aspect_TypeOfResize OcctWindow::DoResize() const
-{
-  int                 aMask = 0;
-  Aspect_TypeOfResize aMode = Aspect_TOR_UNKNOWN;
-
-  if ( !myWidget->isMinimized() )
-  {
-    if ( Abs ( myWidget->rect().left()   - myXLeft   ) > 2 ) aMask |= 1;
-    if ( Abs ( myWidget->rect().right()  - myXRight  ) > 2 ) aMask |= 2;
-    if ( Abs ( myWidget->rect().top()    - myYTop    ) > 2 ) aMask |= 4;
-    if ( Abs ( myWidget->rect().bottom() - myYBottom ) > 2 ) aMask |= 8;
-
-    switch ( aMask )
-    {
-      case 0:
-        aMode = Aspect_TOR_NO_BORDER;
-        break;
-      case 1:
-        aMode = Aspect_TOR_LEFT_BORDER;
-        break;
-      case 2:
-        aMode = Aspect_TOR_RIGHT_BORDER;
-        break;
-      case 4:
-        aMode = Aspect_TOR_TOP_BORDER;
-        break;
-      case 5:
-        aMode = Aspect_TOR_LEFT_AND_TOP_BORDER;
-        break;
-      case 6:
-        aMode = Aspect_TOR_TOP_AND_RIGHT_BORDER;
-        break;
-      case 8:
-        aMode = Aspect_TOR_BOTTOM_BORDER;
-        break;
-      case 9:
-        aMode = Aspect_TOR_BOTTOM_AND_LEFT_BORDER;
-        break;
-      case 10:
-        aMode = Aspect_TOR_RIGHT_AND_BOTTOM_BORDER;
-        break;
-      default:
-        break;
-    }  // end switch
-
-    *( ( Standard_Integer* )&myXLeft  ) = myWidget->rect().left();
-    *( ( Standard_Integer* )&myXRight ) = myWidget->rect().right();
-    *( ( Standard_Integer* )&myYTop   ) = myWidget->rect().top();
-    *( ( Standard_Integer* )&myYBottom) = myWidget->rect().bottom();
-  }
-
-  return aMode;
-}
-
-// =======================================================================
-// function : Ratio
-// purpose  :
-// =======================================================================
-Quantity_Ratio OcctWindow::Ratio() const
-{
-  QRect aRect = myWidget->rect();
-  return Quantity_Ratio( aRect.right() - aRect.left() ) / Quantity_Ratio( aRect.bottom() - aRect.top() );
-}
-
-// =======================================================================
-// function : Size
-// purpose  :
-// =======================================================================
-void OcctWindow::Size ( Standard_Integer& theWidth, Standard_Integer& theHeight ) const
-{
-  QRect aRect = myWidget->rect();
-  theWidth  = aRect.right();
-  theHeight = aRect.bottom();
-}
-
-// =======================================================================
-// function : Position
-// purpose  :
-// =======================================================================
-void OcctWindow::Position ( Standard_Integer& theX1, Standard_Integer& theY1,
-                            Standard_Integer& theX2, Standard_Integer& theY2 ) const
-{
-  theX1 = myWidget->rect().left();
-  theX2 = myWidget->rect().right();
-  theY1 = myWidget->rect().top();
-  theY2 = myWidget->rect().bottom();
-}

samples/qt/Common/src/OcctWindow.h

@@ -1,89 +0,0 @@
-#ifndef OcctWindow_H
-#define OcctWindow_H
-
-#include <Aspect_Window.hxx>
-
-#include <QWidget>
-class OcctWindow;
-
-/*
-  OcctWindow class implements Aspect_Window interface using Qt API 
-  as a platform-independent source of window geometry information. 
-  A similar class should be used instead of platform-specific OCCT 
-  classes (WNT_Window, Xw_Window) in any Qt 5 application using OCCT 
-  3D visualization.
-
-  With Qt 5, the requirement for a Qt-based application to rely fully 
-  on Qt public API and stop using platform-specific APIs looks mandatory. 
-  An example of this is changed QWidget event sequence: when a widget is 
-  first shown on the screen, a resize event is generated before the 
-  underlying native window is resized correctly, however the QWidget instance
-  already holds correct size information at that moment. The OCCT classes 
-  acting as a source of window geometry for V3d_View class (WNT_Window, Xw_Window) 
-  are no longer compatible with changed Qt behavior because they rely on 
-  platform-specific API that cannot return correct window geometry information 
-  in some cases. A reasonable solution is to provide a Qt-based implementation 
-  of Aspect_Window interface at application level.
-*/
-
-class OcctWindow : public Aspect_Window
-{
-public:
-  
-  //! Constructor
-  OcctWindow( QWidget* theWidget, const Quantity_NameOfColor theBackColor = Quantity_NOC_MATRAGRAY );
-
-  virtual void Destroy();
-
-  //! Destructor
-  ~OcctWindow()
-  {
-    Destroy();
-  }
-
-  //! Returns native Window handle
-  virtual Aspect_Drawable NativeHandle() const;
-
-  //! Returns parent of native Window handle.
-  virtual Aspect_Drawable NativeParentHandle() const;
-
-  //! Applies the resizing to the window <me>
-  virtual Aspect_TypeOfResize DoResize() const;
-
-  //! Returns True if the window <me> is opened
-  //! and False if the window is closed.
-  virtual Standard_Boolean IsMapped() const;
-
-  //! Apply the mapping change to the window <me>
-  //! and returns TRUE if the window is mapped at screen.
-  virtual Standard_Boolean DoMapping() const { return Standard_True; }
-
-  //! Opens the window <me>.
-  virtual void Map() const;
-  
-  //! Closes the window <me>.
-  virtual void Unmap() const;
-
-  virtual void Position( Standard_Integer& theX1, Standard_Integer& theY1,
-                         Standard_Integer& theX2, Standard_Integer& theY2 ) const;
-
-  //! Returns The Window RATIO equal to the physical
-  //! WIDTH/HEIGHT dimensions.
-  virtual Quantity_Ratio Ratio() const;
-
-  virtual void Size( Standard_Integer& theWidth, Standard_Integer& theHeight ) const;
-  
-  virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return NULL; }
-
-  DEFINE_STANDARD_RTTI( OcctWindow, Aspect_Window )
-
-protected:
-  Standard_Integer myXLeft;
-  Standard_Integer myYTop;
-  Standard_Integer myXRight;
-  Standard_Integer myYBottom;
-  QWidget* myWidget;
-};
-
-
-#endif // OcctWindow_H

samples/qt/Common/src/View.cxx

@@ -20,8 +20,21 @@
 #include <Graphic3d_ExportFormat.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
 #include <Graphic3d_TextureEnv.hxx>
+  
+#if defined(_WIN32) || defined(__WIN32__)
+#include <WNT_Window.hxx>
+#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+#include <Cocoa_Window.hxx>
+#else
+#include <QX11Info>
+#include <GL/glx.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <Xw_Window.hxx>
+#include <QColormap>
+#endif
 
-#include <OcctWindow.h>
 #include <Aspect_DisplayConnection.hxx>
 
 // the key for multi selection :
@@ -50,6 +63,12 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
   myRaytraceActions( 0 ),
   myBackMenu( NULL )
 {
+#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+  //XSynchronize( x11Display(),true ); // it is possible to use QApplication::syncX();
+  XSynchronize( x11Info().display(),true ); // it is possible to use QApplication::syncX();
+#endif
+
+  myFirst = true;
   myContext = theContext;
 
   myXmin = 0;
@@ -62,6 +81,77 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
   setAttribute(Qt::WA_PaintOnScreen);
   setAttribute(Qt::WA_NoSystemBackground);
 
+#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
+    XVisualInfo* pVisualInfo;
+    if ( x11Info().display() )
+    {
+        /* Initialization with the default VisualID */
+        Visual *v = DefaultVisual( x11Info().display(), DefaultScreen( x11Info().display() ) );
+        int visualID = XVisualIDFromVisual( v );
+
+        /*  Here we use the settings from Optimizer_ViewInfo::TxglCreateWindow() */
+        int visualAttr[] = { GLX_RGBA, GLX_DEPTH_SIZE, 1, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1,
+                             GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, None };
+        pVisualInfo = ::glXChooseVisual( x11Info().display(), DefaultScreen( x11Info().display() ), visualAttr );
+
+        if ( isVisible() )
+            hide();
+
+        XSetWindowAttributes a;
+
+        Window p = RootWindow( x11Info().display(), DefaultScreen( x11Info().display() ) );
+        a.colormap = XCreateColormap( x11Info().display(), RootWindow( x11Info().display(), pVisualInfo->screen ),
+                                      pVisualInfo->visual, AllocNone );
+
+        QColor color = palette().color( backgroundRole() );
+        QColormap colmap = QColormap::instance();
+        a.background_pixel = colmap.pixel( color );
+        a.border_pixel = colmap.pixel( Qt::black );
+        if ( parentWidget() )
+            p = parentWidget()->winId();
+
+        Window w = XCreateWindow( x11Info().display(), p,  x(), y(), width(), height(),
+                                  0, pVisualInfo->depth, InputOutput,  pVisualInfo->visual,
+                                  CWBackPixel | CWBorderPixel | CWColormap, &a );
+        Window *cmw;
+        Window *cmwret;
+        int count;
+        if ( XGetWMColormapWindows( x11Info().display(), topLevelWidget()->winId(), &cmwret, &count ) )
+        {
+            cmw = new Window[count+1];
+            memcpy( (char *)cmw, (char *)cmwret, sizeof(Window)*count );
+            XFree( (char *)cmwret );
+            int i;
+            for ( i = 0; i < count; i++ )
+            {
+              if ( cmw[i] == winId() )  /* replace old window */
+              {
+                  cmw[i] = w;
+                  break;
+              }
+            }
+            if ( i >= count )       /* append new window */
+              cmw[count++] = w;
+        }
+        else
+        {
+            count = 1;
+            cmw = new Window[count];
+            cmw[0] = w;
+        }
+        /* Creating new window (with good VisualID) for this widget */
+        create(w);
+        XSetWMColormapWindows( x11Info().display(), topLevelWidget()->winId(), cmw, count );
+        delete [] cmw;
+
+        if ( isVisible() )
+            show();
+        if ( pVisualInfo )
+            XFree( (char *)pVisualInfo );
+        XFlush( x11Info().display() );
+    }
+#endif
+
   myCurrentMode = CurAction3d_Nothing;
   myHlrModeIsOn = Standard_False;
   setMouseTracking( true );
@@ -74,7 +164,7 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
   setFocusPolicy( Qt::StrongFocus );
   setAttribute( Qt::WA_PaintOnScreen );
   setAttribute( Qt::WA_NoSystemBackground );
-  init();
+
 }
 
 View::~View()
@@ -86,8 +176,19 @@ void View::init()
 {
   if ( myView.IsNull() )
     myView = myContext->CurrentViewer()->CreateView();
+  
+#if defined(_WIN32) || defined(__WIN32__)
+  Aspect_Handle aWindowHandle = (Aspect_Handle )winId();
+  Handle(WNT_Window) hWnd = new WNT_Window (aWindowHandle);
+#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+  NSView* aViewHandle = (NSView* )winId();
+  Handle(Cocoa_Window) hWnd = new Cocoa_Window (aViewHandle);
+#else
+  Window aWindowHandle = (Window )winId();
+  Handle(Aspect_DisplayConnection) aDispConnection = myContext->CurrentViewer()->Driver()->GetDisplayConnection();
+  Handle(Xw_Window) hWnd = new Xw_Window (aDispConnection, aWindowHandle);
+#endif // _WIN32
 
-  Handle(OcctWindow) hWnd = new OcctWindow ( this );
   myView->SetWindow (hWnd);
   if ( !hWnd->IsMapped() )
   {
@@ -103,6 +204,11 @@ void View::init()
 void View::paintEvent( QPaintEvent *  )
 {
 //  QApplication::syncX();
+  if( myFirst )
+  {
+    init();
+    myFirst = false;
+  }
   myView->Redraw();
 }
 

samples/qt/Common/src/View.h

@@ -17,8 +17,8 @@ class View: public QWidget
     Q_OBJECT
 protected:
     enum CurrentAction3d { CurAction3d_Nothing, CurAction3d_DynamicZooming,
-                           CurAction3d_WindowZooming, CurAction3d_DynamicPanning,
-                           CurAction3d_GlobalPanning, CurAction3d_DynamicRotation };
+			               CurAction3d_WindowZooming, CurAction3d_DynamicPanning,
+			               CurAction3d_GlobalPanning, CurAction3d_DynamicRotation };
 
 public:
     enum ViewAction { ViewFitAllId, ViewFitAreaId, ViewZoomId, ViewPanId, ViewGlobalPanId,
@@ -54,14 +54,14 @@ public:
     static QString                GetShapeType( TopAbs_ShapeEnum aShapeType );
 
     Standard_EXPORT static void   OnButtonuseraction( int ExerciceSTEP,
-                                                      Handle(AIS_InteractiveContext)& );
+						                              Handle(AIS_InteractiveContext)& );
     Standard_EXPORT static void   DoSelection( int Id,
                                                Handle(AIS_InteractiveContext)& );
     Standard_EXPORT static void   OnSetSelectionMode( Handle(AIS_InteractiveContext)&,
                                                       Standard_Integer&,
-                                                      TopAbs_ShapeEnum& SelectionMode,
-                                                      Standard_Boolean& );
-    virtual QPaintEngine*         paintEngine() const;
+						                              TopAbs_ShapeEnum& SelectionMode,
+						                              Standard_Boolean& );
+	virtual QPaintEngine*          paintEngine() const;
 signals:
     void                          selectionChanged();
 
@@ -129,7 +129,8 @@ private:
     bool                            myIsReflectionsEnabled;
     bool                            myIsAntialiasingEnabled;
 
-    bool                            myDrawRect;           // set when a rect is used for selection or magnify 
+    bool                            myFirst;
+    bool		                        myDrawRect;           // set when a rect is used for selection or magnify 
     Handle(V3d_View)                myView;
     Handle(AIS_InteractiveContext)  myContext;
     CurrentAction3d                 myCurrentMode;

samples/qt/IESample/env.bat

@@ -9,4 +9,3 @@ set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_IEResourcesDefaults=%RES_DIR%"
 
 set "PATH=%QT_DIR%/bin;%PATH%"
-set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"

samples/qt/Interface/src/Application.h

@@ -14,7 +14,7 @@ public:
   
   enum { FileImportBREPId=0, FileExportBREPId=1, FileImportIGESId=2,
          FileExportIGESId=3, FileImportSTEPId=4, FileExportSTEPId=5,
-         FileExportSTLId=6,  FileExportVRMLId=7, FileUserId };
+         FileExportSTLId=6,  FileExportVRMLId=7 };
 	
   ApplicationWindow();
   ~ApplicationWindow();

samples/qt/Tutorial/env.bat

@@ -9,4 +9,3 @@ set "CSF_ResourcesDefaults=%RES_DIR%"
 set "CSF_TutorialResourcesDefaults=%RES_DIR%"
 
 set "PATH=%QT_DIR%/bin;%PATH%"
-set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_DIR%\plugins\platforms"

src/AIS/AIS_AngleDimension.cxx

@@ -53,8 +53,6 @@
 #include <Geom_Plane.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_AngleDimension,AIS_Dimension)
-
 namespace
 {
   static const TCollection_ExtendedString THE_EMPTY_LABEL_STRING;

src/AIS/AIS_AngleDimension.hxx

@@ -189,14 +189,14 @@ public:
                                             const gp_Pnt& thePoint);
 
   //! @return the display units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const;
   
   //! @return the model units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const;
 
-  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits);
 
-  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits);
 
   //! Principle of horizontal text alignment settings:
   //! - divide circle into two halves according to attachment points
@@ -204,13 +204,13 @@ public:
   //! - if aTextPos is not between attach points but in this half -> Left or Right + positive flyout
   //! - if aTextPos is between reflections of attach points -> Center + negative flyout
   //! - if aTextPos is not between reflections of attach points -> Left or Right + negative flyout
-  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos);
 
-  Standard_EXPORT virtual const gp_Pnt GetTextPosition () const Standard_OVERRIDE;
+  Standard_EXPORT virtual const gp_Pnt GetTextPosition () const;
 
 public:
 
-  DEFINE_STANDARD_RTTIEXT(AIS_AngleDimension,AIS_Dimension)
+  DEFINE_STANDARD_RTTI (AIS_AngleDimension, AIS_Dimension)
 
 protected:
 
@@ -284,19 +284,19 @@ protected:
 
 protected:
 
-  Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE;
+  Standard_EXPORT virtual void ComputePlane();
 
   //! Checks if the plane includes three angle points to build dimension.
-  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const;
 
-  Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Real ComputeValue() const;
 
   Standard_EXPORT  virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePM,
                                          const Handle(Prs3d_Presentation)& thePresentation,
-                                         const Standard_Integer theMode = 0) Standard_OVERRIDE;
+                                         const Standard_Integer theMode = 0);
 
   Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                       const Handle(SelectMgr_EntityOwner)& theOwner) Standard_OVERRIDE;
+                                                       const Handle(SelectMgr_EntityOwner)& theOwner);
 
 protected:
 

src/AIS/AIS_AttributeFilter.cxx

@@ -20,8 +20,6 @@
 #include <SelectMgr_EntityOwner.hxx>
 #include <Standard_Type.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)
-
 AIS_AttributeFilter::AIS_AttributeFilter():
 hasC(Standard_False),
 hasW(Standard_False){}

src/AIS/AIS_AttributeFilter.hxx

@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_AttributeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTI(AIS_AttributeFilter,SelectMgr_Filter)
 
 protected:
 

src/AIS/AIS_Axis.cxx

@@ -43,8 +43,6 @@
 #include <TopoDS.hxx>
 #include <UnitsAPI.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
-
 //=======================================================================
 //function : AIS_Axis
 //purpose  :

src/AIS/AIS_Axis.hxx

@@ -133,7 +133,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_Axis,AIS_InteractiveObject)
 
 protected:
 
@@ -147,7 +147,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeFields();
 

src/AIS/AIS_BadEdgeFilter.cxx

@@ -25,8 +25,6 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
-
 //=======================================================================
 //function : AIS_BadEdgeFilter
 //purpose  : 

src/AIS/AIS_BadEdgeFilter.hxx

@@ -61,7 +61,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_BadEdgeFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTI(AIS_BadEdgeFilter,SelectMgr_Filter)
 
 protected:
 

src/AIS/AIS_C0RegularityFilter.cxx

@@ -28,8 +28,6 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)
-
 //=======================================================================
 //function : AIS_C0RegularityFilter
 //purpose  : 

src/AIS/AIS_C0RegularityFilter.hxx

@@ -47,7 +47,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_C0RegularityFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTI(AIS_C0RegularityFilter,SelectMgr_Filter)
 
 protected:
 

src/AIS/AIS_Chamf2dDimension.cxx

@@ -50,8 +50,6 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
-
 //=======================================================================
 //function : Constructor
 //purpose  : 

src/AIS/AIS_Chamf2dDimension.hxx

@@ -82,7 +82,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf2dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_Chamf2dDimension,AIS_Relation)
 
 protected:
 

src/AIS/AIS_Chamf3dDimension.cxx

@@ -49,8 +49,6 @@
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
-
 //=======================================================================
 //function : Constructor
 //purpose  : 

src/AIS/AIS_Chamf3dDimension.hxx

@@ -81,7 +81,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Chamf3dDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_Chamf3dDimension,AIS_Relation)
 
 protected:
 

src/AIS/AIS_Circle.cxx

@@ -37,8 +37,6 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <TopoDS.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
-
 //=======================================================================
 //function : AIS_Circle
 //purpose  : 

src/AIS/AIS_Circle.hxx

@@ -112,7 +112,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Circle,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_Circle,AIS_InteractiveObject)
 
 protected:
 
@@ -126,7 +126,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeCircle (const Handle(Prs3d_Presentation)& aPresentation);
   

src/AIS/AIS_ColorScale.cxx

@@ -39,8 +39,6 @@
 #include <V3d_View.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)
-
 //=======================================================================
 //function : AIS_ColorScale
 //purpose  :

src/AIS/AIS_ColorScale.hxx

@@ -211,7 +211,7 @@ public:
   Standard_EXPORT void TextSize (const TCollection_ExtendedString& theText, const Standard_Integer theHeight, Standard_Integer& theWidth, Standard_Integer& theAscent, Standard_Integer& theDescent) const;
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ColorScale,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_ColorScale,AIS_InteractiveObject)
 
 protected:
 
@@ -245,11 +245,10 @@ private:
 
   void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                   const Handle(Prs3d_Presentation)& thePresentation,
-                  const Standard_Integer theMode) Standard_OVERRIDE;
+                  const Standard_Integer theMode);
 
   void ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/,
-                           const Standard_Integer /*aMode*/) Standard_OVERRIDE
-  {}
+                           const Standard_Integer /*aMode*/){};
 
   //! Returns the format of text.
   TCollection_AsciiString Format() const;

src/AIS/AIS_ColoredShape.cxx

@@ -44,9 +44,6 @@
 
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape)
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer)
-
 //=======================================================================
 //function : AIS_ColoredShape
 //purpose  :

src/AIS/AIS_ColoredShape.hxx

@@ -54,7 +54,7 @@ public:  //! @name list of overridden properties
   Standard_Boolean myHasOwnWidth;
 
 public:
-  DEFINE_STANDARD_RTTIEXT(AIS_ColoredDrawer,Prs3d_Drawer);
+  DEFINE_STANDARD_RTTI(AIS_ColoredDrawer, Prs3d_Drawer);
 
 };
 
@@ -175,7 +175,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ColoredShape,AIS_Shape);
+  DEFINE_STANDARD_RTTI(AIS_ColoredShape, AIS_Shape);
 
 };
 

src/AIS/AIS_ConcentricRelation.cxx

@@ -41,8 +41,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
-
 //=======================================================================
 //function : Constructor
 //purpose  : 

src/AIS/AIS_ConcentricRelation.hxx

@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ConcentricRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_ConcentricRelation,AIS_Relation)
 
 protected:
 

src/AIS/AIS_ConnectedInteractive.cxx

@@ -44,8 +44,6 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_OrientedShapeMapHasher.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
-
 //=======================================================================
 //function : AIS_ConnectedInteractive
 //purpose  : 

src/AIS/AIS_ConnectedInteractive.hxx

@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_ConnectedInteractive,AIS_InteractiveObject)
 
 protected:
 

src/AIS/AIS_DiameterDimension.cxx

@@ -26,8 +26,6 @@
 #include <Standard_ProgramError.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension)
-
 namespace
 {
   static const Standard_ExtCharacter THE_DIAMETER_SYMBOL (0x00D8);

src/AIS/AIS_DiameterDimension.hxx

@@ -115,22 +115,22 @@ public:
   Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Shape& theShape);
 
   //! @return the display units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const;
   
   //! @return the model units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const;
 
-  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits);
 
-  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits);
 
-  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos);
 
-  Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const gp_Pnt GetTextPosition() const;
 
 public:
 
-  DEFINE_STANDARD_RTTIEXT(AIS_DiameterDimension,AIS_Dimension)
+  DEFINE_STANDARD_RTTI(AIS_DiameterDimension, AIS_Dimension)
 
 protected:
 
@@ -143,19 +143,19 @@ protected:
   //! 2) The plane should inclide th ecircle center to be valid.
   Standard_EXPORT virtual void ComputeAnchorPoint();
 
-  Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE;
+  Standard_EXPORT virtual void ComputePlane();
 
   //! Checks if the center of the circle is on the plane.
-  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const;
 
-  Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Real ComputeValue() const;
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                                         const Handle(Prs3d_Presentation)& thePresentation,
-                                        const Standard_Integer theMode = 0) Standard_OVERRIDE;
+                                        const Standard_Integer theMode = 0);
 
   Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                       const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE;
+                                                       const Handle(SelectMgr_EntityOwner)& theEntityOwner);
 
 protected:
 

src/AIS/AIS_Dimension.cxx

@@ -75,8 +75,6 @@
 #include <UnitsAPI_SystemUnits.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension,AIS_InteractiveObject)
-
 namespace
 {
   // default text strings
@@ -139,6 +137,15 @@ const gp_Pln& AIS_Dimension::GetPlane() const
   return myPlane;
 }
 
+//=======================================================================
+//function : GetGeometryType
+//purpose  : 
+//=======================================================================
+const Standard_Integer AIS_Dimension::GetGeometryType () const
+{
+  return myGeometryType;
+}
+
 //=======================================================================
 //function : SetUserPlane
 //purpose  : 

src/AIS/AIS_Dimension.hxx

@@ -249,7 +249,7 @@ public:
 
   //! Geometry type defines type of shapes on which the dimension is to be built. 
   //! @return type of geometry on which the dimension will be built.
-  Standard_Integer GetGeometryType () const { return myGeometryType; }
+  Standard_EXPORT const Standard_Integer GetGeometryType () const;
 
   //! Sets user-defined plane where the 2D dimension presentation will be placed.
   //! Checks validity of this plane if geometry has been set already.
@@ -298,7 +298,7 @@ public:
   }
 
   //! @return the kind of interactive.
-  virtual AIS_KindOfInteractive Type() const Standard_OVERRIDE
+  virtual AIS_KindOfInteractive Type() const
   {
     return AIS_KOI_Dimension;
   }
@@ -306,7 +306,7 @@ public:
   //! Returns true if the class of objects accepts the display mode theMode.
   //! The interactive context can have a default mode of representation for
   //! the set of Interactive Objects. This mode may not be accepted by object.
-  virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const Standard_OVERRIDE
+  virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const
   {
     return theMode == ComputeMode_All;
   }
@@ -378,7 +378,7 @@ public:
 
 public:
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Dimension,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_Dimension, AIS_InteractiveObject)
 
 protected:
 
@@ -580,7 +580,7 @@ protected: //! @name Behavior to implement
   //! @param theSelection [in] the selection structure to will with primitives.
   //! @param theMode [in] the selection mode.
   Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                 const Standard_Integer theMode) Standard_OVERRIDE;
+                                                 const Standard_Integer theMode);
 
 protected: //! @name Selection geometry
 

src/AIS/AIS_DimensionOwner.cxx

@@ -24,8 +24,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)
-
 namespace
 {
   //=======================================================================

src/AIS/AIS_DimensionOwner.hxx

@@ -71,7 +71,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_DimensionOwner,SelectMgr_EntityOwner)
+  DEFINE_STANDARD_RTTI(AIS_DimensionOwner,SelectMgr_EntityOwner)
 
 protected:
 

src/AIS/AIS_EllipseRadiusDimension.cxx

@@ -46,8 +46,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)
-
 //=======================================================================
 //function : AIS_EllipseRadiusDimension
 //purpose  : 

src/AIS/AIS_EllipseRadiusDimension.hxx

@@ -54,7 +54,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_EllipseRadiusDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_EllipseRadiusDimension,AIS_Relation)
 
 protected:
 

src/AIS/AIS_EqualDistanceRelation.cxx

@@ -48,8 +48,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
-
 //=======================================================================
 //function : AIS_EqualDistanceRelation
 //purpose  : 

src/AIS/AIS_EqualDistanceRelation.hxx

@@ -108,7 +108,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualDistanceRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_EqualDistanceRelation,AIS_Relation)
 
 protected:
 
@@ -122,7 +122,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
 
   TopoDS_Shape myShape3;
   TopoDS_Shape myShape4;

src/AIS/AIS_EqualRadiusRelation.cxx

@@ -40,8 +40,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
-
 //=======================================================================
 //function : AIS_EqualRadiusRelation
 //purpose  : 

src/AIS/AIS_EqualRadiusRelation.hxx

@@ -59,7 +59,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_EqualRadiusRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_EqualRadiusRelation,AIS_Relation)
 
 protected:
 
@@ -73,7 +73,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeRadiusPosition();
 

src/AIS/AIS_ExclusionFilter.cxx

@@ -23,8 +23,6 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
-
 //=======================================================================
 //function : AIS_ExclusionFilter
 //purpose  : Constructors

src/AIS/AIS_ExclusionFilter.hxx

@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ExclusionFilter,SelectMgr_Filter)
+  DEFINE_STANDARD_RTTI(AIS_ExclusionFilter,SelectMgr_Filter)
 
 protected:
 

src/AIS/AIS_FixRelation.cxx

@@ -57,8 +57,6 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
-
 static Standard_Boolean InDomain(const Standard_Real fpar,
 					const Standard_Real lpar,
 					const Standard_Real para) 

src/AIS/AIS_FixRelation.hxx

@@ -101,7 +101,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_FixRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_FixRelation,AIS_Relation)
 
 protected:
 

src/AIS/AIS_GlobalStatus.cxx

@@ -19,8 +19,6 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_GlobalStatus,MMgt_TShared)
-
 AIS_GlobalStatus::AIS_GlobalStatus():
 myStatus(AIS_DS_None),
 myLayerIndex(0),

src/AIS/AIS_GlobalStatus.hxx

@@ -93,7 +93,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_GlobalStatus,MMgt_TShared)
+  DEFINE_STANDARD_RTTI(AIS_GlobalStatus,MMgt_TShared)
 
 protected:
 

src/AIS/AIS_IdenticRelation.cxx

@@ -55,8 +55,6 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
-
 // jfa 15/10/2000
 static Standard_Real Modulo2PI(const Standard_Real ANGLE)
 {

src/AIS/AIS_IdenticRelation.hxx

@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_IdenticRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_IdenticRelation,AIS_Relation)
 
 protected:
 

src/AIS/AIS_InteractiveContext.cxx

@@ -62,8 +62,6 @@
 #include <V3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveContext,MMgt_TShared)
-
 //#include <AIS_DataMapIteratorOfDataMapOfInteractiveInteger.hxx>
 namespace
 {

src/AIS/AIS_InteractiveContext.hxx

@@ -1566,7 +1566,7 @@ public:
 friend class AIS_LocalContext;
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_InteractiveContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTI(AIS_InteractiveContext,MMgt_TShared)
 
 protected:
 

src/AIS/AIS_InteractiveObject.cxx

@@ -44,8 +44,6 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
-
 //=======================================================================
 //function : AIS_InteractiveObject
 //purpose  : 

src/AIS/AIS_InteractiveObject.hxx

@@ -460,7 +460,7 @@ public:
 friend class AIS_InteractiveContext;
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_InteractiveObject,SelectMgr_SelectableObject)
+  DEFINE_STANDARD_RTTI(AIS_InteractiveObject,SelectMgr_SelectableObject)
 
 protected:
 

src/AIS/AIS_LengthDimension.cxx

@@ -19,7 +19,6 @@
 #include <AIS.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepLib_MakeVertex.hxx>
 #include <BRepTopAdaptor_FClass2d.hxx>
 #include <BRepTools.hxx>
@@ -27,8 +26,8 @@
 #include <ElSLib.hxx>
 #include <gce_MakeDir.hxx>
 #include <gce_MakePln.hxx>
-#include <Geom_TrimmedCurve.hxx>
 #include <GeomAPI_ExtremaCurveCurve.hxx>
+#include <GeomAPI_ExtremaCurveSurface.hxx>
 #include <GeomAPI_ExtremaSurfaceSurface.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Line.hxx>
@@ -36,8 +35,6 @@
 #include <TopExp_Explorer.hxx>
 
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
-
 //=======================================================================
 //function : Constructor
 //purpose  : Dimension between two faces
@@ -436,32 +433,28 @@ Standard_Boolean AIS_LengthDimension::InitEdgeFaceLength (const TopoDS_Edge& the
                                                           const TopoDS_Face& theFace,
                                                           gp_Dir& theEdgeDir)
 {
-  // Compute edge direction
-  BRepAdaptor_Curve aCurveAdaptor (theEdge);
-  Handle(Geom_Curve) aCurve = Handle(Geom_Curve)::DownCast (aCurveAdaptor.Curve().Curve()->Transformed (aCurveAdaptor.Trsf()));
-  if (aCurve.IsNull())
-  {
-    return Standard_False;
-  }
-  Standard_Real aFirst = aCurveAdaptor.FirstParameter();
-  Standard_Real aLast = aCurveAdaptor.LastParameter();
-  gp_Pnt aFirstPoint = !Precision::IsInfinite (aFirst) ? aCurve->Value (aFirst) : gp::Origin();
-  gp_Pnt aSecondPoint = !Precision::IsInfinite (aLast) ? aCurve->Value (aLast) : gp::Origin();
-  gce_MakeDir aMakeDir (aFirstPoint, aSecondPoint);
-  if (!aMakeDir.IsDone())
-  {
-    return Standard_False;
-  }
-  theEdgeDir = aMakeDir.Value();
+  Handle(Geom_Curve) aCurve;
+  gp_Pnt aFirstPoint, aSecondPoint;
+  Standard_Boolean isInfinite = Standard_False;
 
-  // Find attachment points
-  BRepExtrema_DistShapeShape aDistAdaptor (theEdge, theFace, Extrema_ExtFlag_MIN);
-  if (!aDistAdaptor.IsDone())
+  if (!AIS::ComputeGeometry (theEdge, aCurve, aFirstPoint, aSecondPoint, isInfinite))
   {
     return Standard_False;
   }
-  myFirstPoint = aDistAdaptor.PointOnShape1 (1);
-  mySecondPoint = aDistAdaptor.PointOnShape2 (1);
+  theEdgeDir = gce_MakeDir (aFirstPoint, aSecondPoint);
+  gp_Pln aPlane;
+  Handle(Geom_Surface) aSurface;
+  AIS_KindOfSurface aSurfType;
+  Standard_Real anOffset;
+
+  if (!AIS::GetPlaneFromFace (theFace, aPlane, aSurface, aSurfType, anOffset))
+  {
+    return Standard_False;
+  }
+
+  GeomAPI_ExtremaCurveSurface aDistAdaptor (aCurve, aSurface);
+
+  aDistAdaptor.NearestPoints (myFirstPoint, mySecondPoint);
 
   return IsValidPoints (myFirstPoint, mySecondPoint);
 }
@@ -585,11 +578,11 @@ Standard_Boolean AIS_LengthDimension::InitTwoShapesPoints (const TopoDS_Shape& t
 
         return isSuccess && IsValidPoints (myFirstPoint, mySecondPoint);
       }
-      else if (theSecondShape.ShapeType() == TopAbs_EDGE)
+      else if (theFirstShape.ShapeType() == TopAbs_EDGE)
       {
         myGeometryType = GeometryType_EdgeFace;
-        isSuccess = InitEdgeFaceLength (TopoDS::Edge (theSecondShape),
-                                        TopoDS::Face (theFirstShape),
+        isSuccess = InitEdgeFaceLength (TopoDS::Edge (theFirstShape),
+                                        TopoDS::Face (theSecondShape),
                                         aDirAttach);
 
         if (isSuccess)
@@ -634,21 +627,6 @@ Standard_Boolean AIS_LengthDimension::InitTwoShapesPoints (const TopoDS_Shape& t
           theIsPlaneComputed = Standard_True;
         }
 
-        return isSuccess;
-      }
-      else if (theSecondShape.ShapeType() == TopAbs_FACE)
-      {
-        myGeometryType = GeometryType_EdgeFace;
-        isSuccess = InitEdgeFaceLength (TopoDS::Edge (theFirstShape),
-                                        TopoDS::Face (theSecondShape),
-                                        aDirAttach);
-
-        if (isSuccess)
-        {
-          theComputedPlane = ComputePlane (aDirAttach);
-          theIsPlaneComputed = Standard_True;
-        }
-
         return isSuccess;
       }
     }

src/AIS/AIS_LengthDimension.hxx

@@ -65,7 +65,7 @@ DEFINE_STANDARD_HANDLE (AIS_LengthDimension, AIS_Dimension)
 //! In case of face-edge, edge-vertex or face-face lengthes the automatic plane
 //! computing is allowed. For this plane the third point is found on the
 //! edge or on the face.
-//!
+//! 
 //! Please note that if the inappropriate geometry is defined
 //! or the distance between measured points is less than
 //! Precision::Confusion(), the dimension is invalid and its
@@ -81,6 +81,8 @@ public:
   Standard_EXPORT AIS_LengthDimension (const TopoDS_Face& theFace,
                                        const TopoDS_Edge& theEdge);
 
+public:
+
   //! Construct length dimension between two faces.
   //! @param theFirstFace [in] the first face (first shape).
   //! @param theSecondFace [in] the second face (second shape).
@@ -181,38 +183,38 @@ public:
                                           const TopoDS_Shape& theSecondShape);
 
   //! @return the display units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const;
 
   //! @return the model units string.
-  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const;
 
-  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits);
 
-  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits);
 
-  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetTextPosition (const gp_Pnt& theTextPos);
 
-  Standard_EXPORT virtual const gp_Pnt GetTextPosition() const Standard_OVERRIDE;
+  Standard_EXPORT virtual const gp_Pnt GetTextPosition() const;
 
 public:
 
-  DEFINE_STANDARD_RTTIEXT(AIS_LengthDimension,AIS_Dimension)
+  DEFINE_STANDARD_RTTI(AIS_LengthDimension, AIS_Dimension)
 
 protected:
 
   //! Checks if the plane includes first and second points to build dimension.
-  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const;
 
   Standard_EXPORT virtual gp_Pln ComputePlane(const gp_Dir& theAttachDir) const;
 
-  Standard_EXPORT Standard_Real ComputeValue() const Standard_OVERRIDE;
+  Standard_EXPORT Standard_Real ComputeValue() const;
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                                         const Handle(Prs3d_Presentation)& thePresentation,
-                                        const Standard_Integer theMode = 0) Standard_OVERRIDE;
+                                        const Standard_Integer theMode = 0);
 
   Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection,
-                                                       const Handle(SelectMgr_EntityOwner)& theEntityOwner) Standard_OVERRIDE;
+                                                       const Handle(SelectMgr_EntityOwner)& theEntityOwner);
 
 protected:
 

src/AIS/AIS_Line.cxx

@@ -39,8 +39,6 @@
 #include <TColgp_Array1OfPnt.hxx>
 #include <UnitsAPI.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
-
 //==================================================================
 // function: FindLimits
 // purpose:

src/AIS/AIS_Line.hxx

@@ -103,7 +103,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_Line,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_Line,AIS_InteractiveObject)
 
 protected:
 
@@ -117,7 +117,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeInfiniteLine (const Handle(Prs3d_Presentation)& aPresentation);
   

src/AIS/AIS_LocalContext.cxx

@@ -49,8 +49,6 @@
 #include <V3d_Viewer.hxx>
 
 #include <stdio.h>
-IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalContext,MMgt_TShared)
-
 static TCollection_AsciiString AIS_Local_SelName(const Standard_Address address,
                                                  const Standard_Integer anIndex)
 {

src/AIS/AIS_LocalContext.hxx

@@ -359,7 +359,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_LocalContext,MMgt_TShared)
+  DEFINE_STANDARD_RTTI(AIS_LocalContext,MMgt_TShared)
 
 protected:
 

src/AIS/AIS_LocalStatus.cxx

@@ -18,8 +18,6 @@
 #include <Standard_Type.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_LocalStatus,MMgt_TShared)
-
 AIS_LocalStatus::AIS_LocalStatus(const Standard_Boolean IsTemp,
 				 const Standard_Boolean Decomp,
 				 const Standard_Integer DMode,

src/AIS/AIS_LocalStatus.hxx

@@ -89,7 +89,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_LocalStatus,MMgt_TShared)
+  DEFINE_STANDARD_RTTI(AIS_LocalStatus,MMgt_TShared)
 
 protected:
 

src/AIS/AIS_MaxRadiusDimension.cxx

@@ -58,8 +58,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
-
 //=======================================================================
 //function : AIS_MaxRadiusDimension
 //purpose  : 

src/AIS/AIS_MaxRadiusDimension.hxx

@@ -69,7 +69,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTI(AIS_MaxRadiusDimension,AIS_EllipseRadiusDimension)
 
 protected:
 

src/AIS/AIS_MidPointRelation.cxx

@@ -53,8 +53,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)
-
 //=======================================================================
 //function : AIS_MidPointRelation
 //purpose  : 

src/AIS/AIS_MidPointRelation.hxx

@@ -67,7 +67,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_MidPointRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_MidPointRelation,AIS_Relation)
 
 protected:
 
@@ -81,7 +81,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeFaceFromPnt (const Handle(Prs3d_Presentation)& aprs, const Standard_Boolean first);
   

src/AIS/AIS_MinRadiusDimension.cxx

@@ -58,8 +58,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
-
 //=======================================================================
 //function : AIS_MinRadiusDimension
 //purpose  : 

src/AIS/AIS_MinRadiusDimension.hxx

@@ -68,7 +68,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
+  DEFINE_STANDARD_RTTI(AIS_MinRadiusDimension,AIS_EllipseRadiusDimension)
 
 protected:
 

src/AIS/AIS_MultipleConnectedInteractive.cxx

@@ -33,8 +33,6 @@
 #include <Standard_Type.hxx>
 #include <TopLoc_Location.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
-
 namespace
 {
   //! SelectMgr_AssemblyEntityOwner replaces original owners in sensitive entities

src/AIS/AIS_MultipleConnectedInteractive.hxx

@@ -100,7 +100,7 @@ public:
   Standard_EXPORT virtual Handle(SelectMgr_EntityOwner) GlobalSelOwner() const Standard_OVERRIDE;
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
+  DEFINE_STANDARD_RTTI(AIS_MultipleConnectedInteractive,AIS_InteractiveObject)
 
 protected:
 

src/AIS/AIS_OffsetDimension.cxx

@@ -56,8 +56,6 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)
-
 //=======================================================================
 //function : AIS_OffsetDimension
 //purpose  : 

src/AIS/AIS_OffsetDimension.hxx

@@ -80,7 +80,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_OffsetDimension,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_OffsetDimension,AIS_Relation)
 
 protected:
 

src/AIS/AIS_ParallelRelation.cxx

@@ -52,8 +52,6 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 
-IMPLEMENT_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)
-
 //=======================================================================
 //function : Constructor
 //purpose  : 

src/AIS/AIS_ParallelRelation.hxx

@@ -76,7 +76,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTIEXT(AIS_ParallelRelation,AIS_Relation)
+  DEFINE_STANDARD_RTTI(AIS_ParallelRelation,AIS_Relation)
 
 protected:
 
@@ -90,7 +90,7 @@ private:
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
   
-  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) Standard_OVERRIDE;
+  Standard_EXPORT void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode);
   
   Standard_EXPORT void ComputeTwoFacesParallel (const Handle(Prs3d_Presentation)& aPresentation);