Corrections according to remarks.

Code corrected to avoid accessing element of sequence by reference after it is removed.

.gitattributes

@@ -41,6 +41,9 @@ FILES       eol=lf
 PACKAGES    eol=lf
 EXTERNLIB   eol=lf
 UDLIST      eol=lf
+tests/*     eol=lf
+tests/*/*   eol=lf
+tests/*/*/* eol=lf
 *.bat       eol=crlf
 *.cmd       eol=crlf
 *.rc        eol=crlf

.gitignore

@@ -34,6 +34,9 @@ Release
 *.ncb
 *.suo
 *.sdf
+*.opensdf
+*.ipch
+*.aps
 
 # test results
 /results*

CMakeLists.txt

@@ -1,658 +1,352 @@
-cmake_minimum_required ( VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
 
+set (CMAKE_SUPPRESS_REGENERATION TRUE)
+
+# set build configurations list
 if (NOT BUILD_CONFIGURATION)
-  set(BUILD_CONFIGURATION "Release" CACHE STRING "Build type of OCCT" FORCE)
+  set (BUILD_CONFIGURATION "Release" CACHE STRING "Build type of OCCT" FORCE)
   SET_PROPERTY(CACHE BUILD_CONFIGURATION PROPERTY STRINGS Release Debug RelWithDebInfo)
 endif()
 
-set(CMAKE_CONFIGURATION_TYPES ${BUILD_CONFIGURATION} CACHE INTERNAL "" FORCE)
+set (CMAKE_CONFIGURATION_TYPES ${BUILD_CONFIGURATION} CACHE INTERNAL "" FORCE)
 
-project(OCCT)
+# set type of OCCT libraries
+if (NOT BUILD_LIBRARY_TYPE)
+  set (BUILD_LIBRARY_TYPE "Shared" CACHE STRING "The type of OCCT libraries" FORCE)
+  SET_PROPERTY(CACHE BUILD_LIBRARY_TYPE PROPERTY STRINGS Shared Static)
+endif()
 
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+if ("${BUILD_LIBRARY_TYPE}" STREQUAL "Shared")
+  set (BUILD_SHARED_LIBS ON)
+else()
+  unset (BUILD_SHARED_LIBS)
+endif()
 
-set(BUILD_SHARED_LIBS ON)
+# the name of the project
+project (OCCT)
 
-IF("${BUILD_CONFIGURATION}" STREQUAL "${CMAKE_BUILD_TYPE}")
-  SET(CHANGES_ARE_NEEDED OFF)
-ELSE()
-  SET(CHANGES_ARE_NEEDED ON)
-ENDIF()
+# Solution folder property
+set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
-MATH(EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
+set (CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
 
-SET(CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
+# install dir of the built project
+set (INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
+set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
 
-SET(INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
-SET(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
+# whether install test bundle or not
+set (INSTALL_TESTS OFF CACHE BOOL "Is tests copy to install directory")
 
-set(BUILD_PATCH_DIR "" CACHE PATH "directory with occt patch")
+set (BUILD_PATCH_DIR "" CACHE PATH "directory with OCCT patch")
 
+# the list of being built toolkits
 set (BUILD_TOOLKITS "" CACHE STRING "Toolkits are also included in OCCT")
-separate_arguments(BUILD_TOOLKITS)
-
-IF(MSVC)
-  SET(BUILD_Samples OFF CACHE BOOL "OCCT samples building")
-ENDIF()
-
-# consider for patch existence
-SET (IS_PATCH_CURRENT "NO")
-SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
-IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "")
-  SET (IS_PATCH_CURRENT "YES")
-  SET (TK_ROOT_DIR ${BUILD_PATCH_DIR})
-ENDIF()
-
-# include the list of patch modules if the one exists
-# or include the list of original modules
-IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/CMakeModules.txt")
-  MESSAGE(STATUS "Info: the list of patched modules is included")
-  include(${BUILD_PATCH_DIR}/adm/cmake/CMakeModules.txt)
-ELSE()
-  include(adm/cmake/CMakeModules.txt)
-ENDIF()
-
-if (WIN32)
-  set(SCRIPT_EXT bat)
-else()
-  set(SCRIPT_EXT sh)
-endif()
+separate_arguments (BUILD_TOOLKITS)
 
 if (MSVC)
-  add_definitions(/fp:precise)
+  set (BUILD_MFC_SAMPLES OFF CACHE BOOL "OCCT samples building")
 endif()
 
-# choose SSE2 option for appropriate MSVC compilers
-if (MSVC80 OR MSVC90 OR MSVC10)
-  if (${COMPILER_BITNESS} STREQUAL 32)
-    add_definitions(/arch:SSE2)
-  endif()
+# whether use optional 3rdparty or not
+if (APPLE)
+  set (USE_GLX OFF CACHE BOOL "Are X11 OpenGL used on OSX or not")
 endif()
 
-# set compiler short name
-if (MSVC)
-  if (MSVC70)
-    set (COMPILER vc7)
-  elseif (MSVC80)
-    set (COMPILER vc8)
-  elseif (MSVC90)
-    set (COMPILER vc9)
-  elseif (MSVC10)
-    set (COMPILER vc10)
-  elseif (MSVC11)
-    set (COMPILER vc11)
-  endif()
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
-  set (COMPILER gcc)
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-  set (COMPILER gxx)
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  set (COMPILER clang)
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-  set (COMPILER icc)
-else()
-  set (COMPILER ${CMAKE_GENERATOR})
-  string (REGEX REPLACE " " "" COMPILER ${COMPILER})
+set (USE_FREEIMAGE OFF CACHE BOOL "Is freeimage used or not")
+set (USE_VTK OFF CACHE BOOL "Is VTK used or not")
+
+if (NOT DEFINED ANDROID)
+  set (USE_GL2PS OFF CACHE BOOL "Is gl2ps used or not")
+  set (USE_TBB OFF CACHE BOOL "Is tbb used or not")
+  set (USE_OPENCL OFF CACHE BOOL "Is OpenCL used or not")
 endif()
 
-if (WIN32)
-  SET(OS_WITH_BIT "win${COMPILER_BITNESS}")
-elseif(APPLE)
-  SET(OS_WITH_BIT "mac${COMPILER_BITNESS}")
-else()
-  SET(OS_WITH_BIT "lin${COMPILER_BITNESS}")
-endif()
-
-if (${COMPILER_BITNESS} STREQUAL 64)
-  add_definitions(-D_OCC64)
-endif()
-
-add_definitions(-DCSFDB)
-if(WIN32)
-  add_definitions(/DWNT -wd4996)
-elseif(APPLE)
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
-else()
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
-endif()
-
-# enable structured exceptions for MSVC
-string(REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
-IF(ISFLAG)
-  STRING(REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-ELSEIF(WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
-ENDIF()
-
-# enable parallel compilation on MSVC 9 and above
-IF(WIN32)
-  IF(NOT DEFINED MSVC70 AND NOT DEFINED MSVC80)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
-  ENDIF()
-ENDIF()
-
-# 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}")
+# macro: include patched file if it exists
+macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
+  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
+    include(${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
   else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    include(${BEING_INCLUDED_FILE}.cmake)
   endif()
-elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+endmacro()
+
+# include occt macros
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+
+# BUILD_POSTFIX variable is used by all toolkit cmakelists.txt projects
+OCCT_MAKE_BUILD_POSTFIX()
+
+# include the patched or original list of modules
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_modules")
+
+# include the list of being used toolkits. USED_TOOLKITS variable
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_toolkits")
+
+# include the patched or original list of definitions and flags
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_defs_flags")
+
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/3rdparty_macro")
+
+set (3RDPARTY_DIR_LABEL "The directory containing required 3rdparty products")
+if (NOT DEFINED 3RDPARTY_DIR)
+  set (3RDPARTY_DIR "" CACHE PATH ${3RDPARTY_DIR_LABEL})
 endif()
 
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+# search for 3rdparty dir
+if ("${3RDPARTY_DIR}" STREQUAL "")
+  if (DEFINED ENV{3RDPARTY_DIR})
+    set (3RDPARTY_DIR "$ENV{3RDPARTY_DIR}" CACHE PATH ${3RDPARTY_DIR_LABEL} 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_LABEL} FORCE)
+  endif()
+endif()
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEB")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEB")
+# search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED(CSF_TclLibs USE_TCL)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin)
+if ("${USE_TCL}" STREQUAL ON)
+  message (STATUS "Info: tcl is used by OCCT")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tcl")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TCL")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TK")
+endif()
 
-# RESOURCES
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/DrawResources" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/StdResource" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/SHMessage" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/Textures" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/Shaders" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XSMessage" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XSTEPResource" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XmlOcafResource" DESTINATION  "${INSTALL_DIR}/src" )
+# search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)
 
-install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Lexi_Expr.dat" DESTINATION  "${INSTALL_DIR}/src/UnitsAPI" )
-install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Units.dat"     DESTINATION  "${INSTALL_DIR}/src/UnitsAPI" )
-install(FILES "${CMAKE_SOURCE_DIR}/src/TObj/TObj.msg" DESTINATION  "${INSTALL_DIR}/src/TObj" )
+if ("${USE_FREETYPE}" STREQUAL ON)
+  message (STATUS "Info: freetype is used by OCCT")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freetype")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build")
+endif()
 
-IF("${BUILD_CONFIGURATION}" STREQUAL "Debug") 
-  SET(3RDPARTY_BUILD_SUFFIX "") # debug == release
-  SET(BUILD_SUFFIX "d")
-ELSE()
-  SET(3RDPARTY_BUILD_SUFFIX "") 
-  SET(BUILD_SUFFIX "")
-ENDIF()
-
-FUNCTION(SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
-  file(GLOB SUB_ITEMS "${MAIN_DIRECTORY}/*")
-
-  foreach(ITEM ${SUB_ITEMS})
-    if(IS_DIRECTORY "${ITEM}")
-      GET_FILENAME_COMPONENT(ITEM_NAME "${ITEM}" NAME)
-      LIST(APPEND LOCAL_RESULT "${ITEM_NAME}")
-    endif()
-  endforeach()
-  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
-ENDFUNCTION()
-
-FUNCTION(FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
-  string( TOLOWER "${PRODUCT_NAME}" 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)
-
-  FOREACH( SEARCH_TEMPLATE ${SEARCH_TEMPLATES})
-    IF(LOCAL_RESULT)
-      BREAK()
-    ENDIF()
-
-    FOREACH(SUBDIR_NAME ${SUBDIR_NAME_LIST})
-      string( TOLOWER "${SUBDIR_NAME}" lower_SUBDIR_NAME )
-
-      STRING(REGEX MATCH "${SEARCH_TEMPLATE}" DUMMY_VAR "${lower_SUBDIR_NAME}")
-      IF(DUMMY_VAR)
-        LIST(APPEND LOCAL_RESULT ${SUBDIR_NAME})
-      ENDIF()
-    ENDFOREACH()
-  ENDFOREACH()
-
-  IF(LOCAL_RESULT)
-    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()
-
-IF(WIN32)
-  SET(DLL_SO "dll")
-  SET(DLL_SO_FOLDER "bin")
-  SET(DLL_SO_PREFIX "")
-ELSEIF(APPLE)
-  SET(DLL_SO "dylib")
-  SET(DLL_SO_FOLDER "lib")
-  SET(DLL_SO_PREFIX "lib")
-ELSE()
-  SET(DLL_SO "so")
-  SET(DLL_SO_FOLDER "lib")
-  SET(DLL_SO_PREFIX "lib")
-ENDIF()
-
-SET(3RDPARTY_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory contains required 3rdparty products")
-SET(3RDPARTY_INCLUDE_DIRS "")
-SET(3RDPARTY_NOT_INCLUDED)
-
-IF(APPLE)
-  SET(USE_GLX OFF CACHE BOOL "whether use X11 OpenGL on OSX or not")
-ENDIF()
-
-SET(USE_GL2PS OFF CACHE BOOL "whether use gl2ps product or not")
-SET(USE_FREEIMAGE OFF CACHE BOOL "whether use freeimage product or not")
-SET(USE_TBB OFF CACHE BOOL "whether use tbb product or not")
-SET(USE_OPENCL OFF CACHE BOOL "whether use OpenCL or not")
-
-SET(INSTALL_TESTS OFF CACHE BOOL "Is tests copy to install directory")
-
-MACRO (CHECK_AND_UNSET VARNAME)
-  IF(DEFINED ${VARNAME})
-    UNSET(${VARNAME} CACHE)
-  ENDIF()
-ENDMACRO()
-
-MACRO (CHECK_AND_UNSET_GROUP VARNAME)
-  CHECK_AND_UNSET ("${VARNAME}_DIR")
-  CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
-  CHECK_AND_UNSET ("${VARNAME}_DLL")
-  CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
-ENDMACRO()
-
-MACRO(THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME)
-  IF(NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
-    SET(3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "Directory contains ${PRODUCT_NAME} product")
-  ENDIF()
-
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_${PRODUCT_NAME}_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
-    IF("${${PRODUCT_NAME}_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "${PRODUCT_NAME} DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "Directory contains ${PRODUCT_NAME} product" FORCE)
-    ENDIF()
-  ENDIF()
-
-  SET(INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} lib copy to install directory")
-
-  IF(3RDPARTY_${PRODUCT_NAME}_DIR)
-    IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the ${PRODUCT_NAME} product" FORCE)
-      if ("${PRODUCT_NAME}" STREQUAL "FREETYPE")
-        FIND_PATH(3RDPARTY_FREETYPE_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_FREETYPE_DIR}/include" "${3RDPARTY_FREETYPE_DIR}/include/freetype2" NO_DEFAULT_PATH)
-      else()
-        FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include" NO_DEFAULT_PATH)
-      endif()
-    ENDIF()
-
-    IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of the ${PRODUCT_NAME} product" FORCE)
-      FIND_LIBRARY(3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME}  PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib" NO_DEFAULT_PATH)
-    ENDIF()
-
-    IF("${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of the ${PRODUCT_NAME} product" FORCE)
-      FIND_FILE(3RDPARTY_${PRODUCT_NAME}_DLL "${DLL_SO_PREFIX}${LIBRARY_NAME}.${DLL_SO}"  PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/${DLL_SO_FOLDER}" NO_DEFAULT_PATH)
-    ENDIF()
-
-    MARK_AS_ADVANCED(3RDPARTY_${PRODUCT_NAME}_DIR)
-  ELSE()
-
-  ENDIF()
-
-  # check default path (with additions) for header search
-  IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
-    SET(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the ${PRODUCT_NAME} product" FORCE)
-    FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_HEADER})
-  ENDIF()
-
-  # check default path (with additions) for library search
-  IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "" OR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
-    SET(3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Directory contains library of the ${PRODUCT_NAME} product" FORCE)
-    FIND_LIBRARY(3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME} ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_LIB})
-  ENDIF()
-
-  # check default path (with additions) for DLL search
-  IF("${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "" OR "${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND")
-    SET(3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Directory contains shared library of the ${PRODUCT_NAME} product" FORCE)
-    FIND_FILE(3RDPARTY_${PRODUCT_NAME}_DLL "${DLL_SO_PREFIX}${LIBRARY_NAME}.${DLL_SO}" ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL})
-  ENDIF()
-
-  IF(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-  ENDIF()
-
-  IF(3RDPARTY_${PRODUCT_NAME}_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY)
-  ENDIF()
-
-  IF(3RDPARTY_${PRODUCT_NAME}_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL)
-  ENDIF()
-
-  IF(INSTALL_${PRODUCT_NAME})
-    INSTALL(FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
-    SET(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "")
-  ELSE()
-    GET_FILENAME_COMPONENT(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-  ENDIF()
-ENDMACRO()
-
-# TCL
-INCLUDE(adm/templates/tcl.cmake)
-
-#install tcltk
-IF(INSTALL_TCL)
-  SET(3RDPARTY_TCL_DLL_DIR "")
-  SET(3RDPARTY_TCL_LIB_DIR "")
-  
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIB_DIR_INSIDE "${3RDPARTY_TCL_LIBRARY}" PATH)
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_DLL_DIR_INSIDE "${3RDPARTY_TCL_DLL}" PATH)
-
-  IF (IS_TCL_VERSION_FOUND)
-    SET (TCL_VERSION ${TCL_MAJOR_VERSION}${TCL_SEP}${TCL_MINOR_VERSION})
-    SET (TCL_FOLDER_VERSION ${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
-  ELSE()
-    SET (TCL_VERSION "")
-
-    #TODO SEARCH tclX.X & tkX.X subdirs
-    SET (TCL_FOLDER_VERSION "")
-  ENDIF()
-  
-  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tcl${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
-  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
-  
-  IF (IS_TCL_VERSION_FOUND)
-    # tcl is required to install in lib folder (without ${BUILD_SUFFIX})
-    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl8" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-  ELSE()
-    MESSAGE(STATUS "\nWarning: tclX.X and tkX.X subdirs won't be copyied during the installation process.")
-    MESSAGE(STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
-  ENDIF()
-ELSE()
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIB_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-ENDIF()
+# VTK
+if (USE_VTK)
+  add_definitions (-DHAVE_VTK)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/vtk")
+endif()
 
 # GLX
-IF(USE_GLX)
-  ADD_DEFINITIONS(-DMACOSX_USE_GLX)
-
-  IF(NOT DEFINED 3RDPARTY_GLX_DIR)
-    SET(3RDPARTY_GLX_DIR "" CACHE PATH "Directory contains GLX product")
-  ENDIF()
-
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_GLX_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" GLX GLX_DIR_NAME)
-    IF("${GLX_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "GLX DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_GLX_DIR "${3RDPARTY_DIR}/${GLX_DIR_NAME}" CACHE PATH "Directory contains GLX product" FORCE)
-    ENDIF()
-  ENDIF()
-
-  IF(3RDPARTY_GLX_DIR)
-    SET(3RDPARTY_GLX_INCLUDE_DIR "${3RDPARTY_GLX_DIR}/include" CACHE FILEPATH "Directory contains headers of the GLX product" FORCE)
-    SET(3RDPARTY_GLX_LIBRARY_DIR "${3RDPARTY_GLX_DIR}/lib"     CACHE FILEPATH "Directory contains library of the GLX product" FORCE)
-
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_GLX_INCLUDE_DIR}")
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_GLX_LIBRARY_DIR}")
-
-    MARK_AS_ADVANCED(3RDPARTY_GLX_DIR)
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_GLX_INCLUDE_DIR)
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_GLX_LIBRARY_DIR)
-  ENDIF()
-ENDIF()
-
-# FREETYPE
-THIRDPARTY_PRODUCT("FREETYPE" "ft2build.h" "freetype${3RDPARTY_BUILD_SUFFIX}")
+if (USE_GLX)
+  add_definitions (-DMACOSX_USE_GLX)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/glx")
+endif()
 
 # FREEIMAGE
-IF(USE_FREEIMAGE)
-  ADD_DEFINITIONS(-DHAVE_FREEIMAGE)
-
-  THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "freeimage${3RDPARTY_BUILD_SUFFIX}")
-  IF(WIN32)
-    IF("${3RDPARTY_FREEIMAGE_DIR}" STREQUAL "")
-    ELSE()
-      SET (3RDPARTY_FREEIMAGEPLUS_DIR "${3RDPARTY_FREEIMAGE_DIR}")
-    ENDIF()
-
-    THIRDPARTY_PRODUCT("FREEIMAGEPLUS" "FreeImagePlus.h" "freeimageplus${3RDPARTY_BUILD_SUFFIX}")
-
-  ENDIF()
-ELSE()
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGEPLUS")
-  CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
-  CHECK_AND_UNSET ("INSTALL_FREEIMAGEPLUS")
-ENDIF()
+if (USE_FREEIMAGE)
+  add_definitions (-DHAVE_FREEIMAGE)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimage")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimageplus")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGEPLUS")
+  OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
+  OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGEPLUS")
+endif()
 
 # GL2PS
-IF(USE_GL2PS)
-  ADD_DEFINITIONS(-DHAVE_GL2PS)
-  THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "gl2ps${3RDPARTY_BUILD_SUFFIX}")
-ELSE()
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
-  CHECK_AND_UNSET ("INSTALL_GL2PS")
-ENDIF()
+if (USE_GL2PS)
+  add_definitions (-DHAVE_GL2PS)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/gl2ps")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
+  OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
+endif()
 
 # OPENCL
-IF(USE_OPENCL)
-  ADD_DEFINITIONS(-DHAVE_OPENCL)
-
-  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
-                                                  $ENV{INTELOCLSDKROOT}/include
-                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
-                                                  $ENV{ATISTREAMSDKROOT}/include)
-
-
-  IF(${COMPILER_BITNESS} STREQUAL 32)
-    SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
-                                                 $ENV{INTELOCLSDKROOT}/lib/x86
-                                                 $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
-                                                 $ENV{ATISTREAMSDKROOT}/lib/x86)
-  ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
-    SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
-                                                 $ENV{INTELOCLSDKROOT}/lib/x64
-                                                 $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
-                                                 $ENV{ATISTREAMSDKROOT}/lib/x86_64)
-  ENDIF()
-
-
-  THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL${3RDPARTY_BUILD_SUFFIX}")
-
-  # if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
-  # then try to find OpenCL/cl.h (all other variable won't be changed)
-  IF("${3RDPARTY_OPENCL_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_OPENCL_INCLUDE_DIR}" STREQUAL "3RDPARTY_OPENCL_INCLUDE_DIR-NOTFOUND")
-    THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL${3RDPARTY_BUILD_SUFFIX}")
-  ENDIF()
-  
-ELSE()
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
-  CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
-  CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
-  CHECK_AND_UNSET ("INSTALL_OPENCL")
-ENDIF()
+if (USE_OPENCL)
+  add_definitions (-DHAVE_OPENCL)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/opencl")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
+  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
+  OCCT_CHECK_AND_UNSET ("INSTALL_OPENCL")
+endif()
 
 # TBB
-IF (USE_TBB)
-  ADD_DEFINITIONS(-DHAVE_TBB)
+if (USE_TBB)
+  add_definitions (-DHAVE_TBB)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tbb")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
+  OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
+endif()
 
-  INCLUDE(adm/templates/tbb.cmake)
+string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
 
-  IF(INSTALL_TBB)
-    INSTALL(FILES "${3RDPARTY_TBB_DLL}" "${3RDPARTY_TBB_MALLOC_DLL}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
+# check all 3rdparty paths
+if (3RDPARTY_NOT_INCLUDED)
+  message (FATAL_ERROR "NOT FOUND: ${3RDPARTY_NOT_INCLUDED}" )
+endif()
 
-    SET(3RDPARTY_TBB_DLL_DIR "")
-    SET(3RDPARTY_TBB_MALLOC_DLL_DIR "")
-  ELSE()
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_DLL_DIR "${3RDPARTY_TBB_DLL}" PATH)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_MALLOC_DLL_DIR "${3RDPARTY_TBB_MALLOC_DLL}" PATH)
-  ENDIF()
-ELSE()
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
-  CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB_MALLOC")
-  CHECK_AND_UNSET ("3RDPARTY_TBB_DIR_NAME")
-  CHECK_AND_UNSET ("INSTALL_TBB")
-ENDIF()
+if (3RDPARTY_INCLUDE_DIRS)
+  list (REMOVE_DUPLICATES 3RDPARTY_INCLUDE_DIRS)
+  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_INCLUDE_DIRS_WITH_ENDS "${3RDPARTY_INCLUDE_DIRS}")
+  message (STATUS "The directories containing 3rdparty headers: ${3RDPARTY_INCLUDE_DIRS_WITH_ENDS}")
+  include_directories (${3RDPARTY_INCLUDE_DIRS})
+endif()
 
-string( REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
+if (3RDPARTY_LIBRARY_DIRS)
+  list (REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
+  string (REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
+  message (STATUS "The directories containing 3rdparty libraries: ${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
+  link_directories (${3RDPARTY_LIBRARY_DIRS})
+endif()
 
-#CHECK ALL 3RDPARTY PATHS
-IF(3RDPARTY_NOT_INCLUDED)
-  MESSAGE(FATAL_ERROR "NOT FOUND: ${3RDPARTY_NOT_INCLUDED}" )
-ENDIF()
+OCCT_MAKE_BUILD_POSTFIX()
 
-list(REMOVE_DUPLICATES 3RDPARTY_INCLUDE_DIRS)
-string( REGEX REPLACE ";" "\n\t" 3RDPARTY_INCLUDE_DIRS_WITH_ENDS "${3RDPARTY_INCLUDE_DIRS}")
-MESSAGE(STATUS "3RDPARTY_INCLUDE_DIRS: ${3RDPARTY_INCLUDE_DIRS_WITH_ENDS}")
-include_directories( ${3RDPARTY_INCLUDE_DIRS} )
+# build directories
+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin${BUILD_POSTFIX})
 
-list(REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
-string( REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
-MESSAGE(STATUS "3RDPARTY_LIBRARY_DIRS: ${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
-link_directories( ${3RDPARTY_LIBRARY_DIRS} )
-
-IF("${INSTALL_DIR}" STREQUAL "")
-  MESSAGE(FATAL_ERROR "INSTALL_DIR is empty")
-ELSE()
+if ("${INSTALL_DIR}" STREQUAL "")
+  message (FATAL_ERROR "INSTALL_DIR variable is empty. It's required to define installation directory")
+else()
   # inc,data,tests DIRECTORY
-  install(DIRECTORY "${CMAKE_SOURCE_DIR}/inc"          DESTINATION  "${INSTALL_DIR}")
-  install(DIRECTORY "${CMAKE_SOURCE_DIR}/data"         DESTINATION  "${INSTALL_DIR}")
-  install(DIRECTORY "${CMAKE_SOURCE_DIR}/samples/tcl"  DESTINATION  "${INSTALL_DIR}/samples")
-  IF(INSTALL_TESTS)
-    install(DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
-  ENDIF()
+  install (DIRECTORY "${CMAKE_SOURCE_DIR}/inc"          DESTINATION  "${INSTALL_DIR}")
+  install (DIRECTORY "${CMAKE_SOURCE_DIR}/data"         DESTINATION  "${INSTALL_DIR}")
+  install (DIRECTORY "${CMAKE_SOURCE_DIR}/samples/tcl"  DESTINATION  "${INSTALL_DIR}/samples")
+  if (INSTALL_TESTS)
+    install (DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
+  endif()
+
+  # install patch inc, data, tests folder
+  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
+    if (EXISTS "${BUILD_PATCH_DIR}/inc")
+      install (DIRECTORY "${BUILD_PATCH_DIR}/inc" DESTINATION  "${INSTALL_DIR}" )
+    endif()
+
+    if (EXISTS "${BUILD_PATCH_DIR}/data")
+      install (DIRECTORY "${BUILD_PATCH_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
+    endif()
+
+    if (INSTALL_TESTS)
+      if (EXISTS "${BUILD_PATCH_DIR}/tests")
+        install (DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
+      endif()
+    endif()
+  endif()
+
+  if (WIN32)
+    set (SCRIPT_EXT bat)
+  else()
+    set (SCRIPT_EXT sh)
+  endif()
 
-    # install patch inc, data, tests folder
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "")
-    IF(EXISTS "${BUILD_PATCH_DIR}/inc")
-      install(DIRECTORY "${BUILD_PATCH_DIR}/inc" DESTINATION  "${INSTALL_DIR}" )
-    ENDIF()
-    
-    IF(EXISTS "${BUILD_PATCH_DIR}/data")
-      install(DIRECTORY "${BUILD_PATCH_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
-    ENDIF()
-    
-    IF(INSTALL_TESTS)
-      IF(EXISTS "${BUILD_PATCH_DIR}/tests")
-        install(DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
-      ENDIF()
-    ENDIF()
-  ENDIF()
-  
   # DRAW.BAT or DRAW.SH
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
-    install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS  
+    install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
             OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
   ELSE()
-    install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS  
+    install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
             OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
   ENDIF()
-  
-  
-  SET(CUSTOM_CUR "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_SUFFIX}.${SCRIPT_EXT}")
-  
+
+  # set compiler short name
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  SET(SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_POSTFIX}.${SCRIPT_EXT}")
+
   if (WIN32)
-    SET (CUSTOM_ADD_CONTENT "\nif exist \"%~dp0${CUSTOM_CUR}\" (\n  call \"%~dp0${CUSTOM_CUR}\" %1 %2 %3 \n)")
+    SET (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM}\" (\n  call \"%~dp0${SUB_CUSTOM}\" %1 %2 %3 \n)")
   else()
-    SET (CUSTOM_ADD_CONTENT "\nif [ -e \"\${aScriptPath}/${CUSTOM_CUR}\" ]; then\n  source \"\${aScriptPath}/${CUSTOM_CUR}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
+    SET (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
   endif()
-  
+
   # change custom.bat/sh
   if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
-    FILE(READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+    file (READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
 
-    SET (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${CUSTOM_ADD_CONTENT}")
+    set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
 
-    FILE(WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+    file (WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
   else()
-    IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.main")
-      configure_file("${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" @ONLY)
-    ELSE()
-      configure_file("${CMAKE_SOURCE_DIR}/adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" @ONLY)
-    ENDIF()
-
-    install(FILES "${OCCT_BINARY_DIR}/custom.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}")
+    OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}")
   endif()
 
   # write current custom.bat/sh
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.in")
-    configure_file("${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.in" ${CUSTOM_CUR} @ONLY)
-  ELSE()
-    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/custom.${SCRIPT_EXT}.in" ${CUSTOM_CUR} @ONLY)
-  ENDIF()
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.in" "${SUB_CUSTOM}" "${INSTALL_DIR}")
 
-  install(FILES "${OCCT_BINARY_DIR}/${CUSTOM_CUR}" DESTINATION  "${INSTALL_DIR}" )
-  
-  IF (BUILD_Samples)
-    IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/sample.bat")
-      install(FILES "${BUILD_PATCH_DIR}/adm/templates/sample.bat" DESTINATION  "${INSTALL_DIR}")
-    ELSE()
-      install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/sample.bat" DESTINATION  "${INSTALL_DIR}")
-    ENDIF()
-  ENDIF()
+  if (BUILD_MFC_SAMPLES)
+    OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
+  endif()
 
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/env.${SCRIPT_EXT}.in")
-    configure_file("${BUILD_PATCH_DIR}/adm/templates/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
-  ELSE()
-    configure_file("${CMAKE_SOURCE_DIR}/adm/templates/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
-  ENDIF()
-  install(FILES "${OCCT_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" )
-ENDIF()
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}" "${INSTALL_DIR}")
+endif()
+
+# RESOURCES
+OCCT_INSTALL_FILE_OR_DIR ("src/DrawResources"          "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/StdResource"            "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/SHMessage"              "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/Textures"               "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/Shaders"                "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/XSMessage"              "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/XSTEPResource"          "${INSTALL_DIR}/src")
+OCCT_INSTALL_FILE_OR_DIR ("src/XmlOcafResource"        "${INSTALL_DIR}/src")
+
+OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Lexi_Expr.dat" "${INSTALL_DIR}/src/UnitsAPI")
+OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Units.dat"     "${INSTALL_DIR}/src/UnitsAPI")
+OCCT_INSTALL_FILE_OR_DIR ("src/TObj/TObj.msg"          "${INSTALL_DIR}/src/TObj")
+
+
+#Toolkits uses variables: INSTALL_DIR, OS_WITH_BIT, COMPILER, BUILD_POSTFIX
+OCCT_MAKE_OS_WITH_BITNESS()
+
+# consider for patch existence
+set (IS_PATCH_CURRENT "NO")
+set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
+if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
+  set (IS_PATCH_CURRENT "YES")
+  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
+endif()
 
 # include patched toolkit projects or original ones
-SET (UNSUBDIRS "")
-IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/CMakeToolKitsDeps.txt")
-  include(${BUILD_PATCH_DIR}/adm/cmake/CMakeToolKitsDeps.txt)
-ELSE()
-  SET (IS_PATCH_CURRENT "NO")
-  SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
-  include(adm/cmake/CMakeToolKitsDeps.txt)
-ENDIF()
+set (UNSUBDIRS "")
+if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake")
+  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
+  include (${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake)
+else()
+  set (IS_PATCH_CURRENT "NO")
+  set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
+  include (adm/cmake/occt_inc_toolkits.cmake)
+endif()
 
-# include some required original toolkit
-IF(NOT "${UNSUBDIRS}" STREQUAL "")
-  SET (IS_PATCH_CURRENT "NO")
-  SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
+# include some required original occt_inc_toolkits
+if (NOT "${UNSUBDIRS}" STREQUAL "")
+  set (IS_PATCH_CURRENT "NO")
   # add required subdirs
-  FOREACH(UNSUBDIR ${UNSUBDIRS})
-    MESSAGE(STATUS "${UNSUBDIR}")
-    subdirs(${TK_ROOT_DIR}/${UNSUBDIR})
-  ENDFOREACH()
-ENDIF()
+  foreach (UNSUBDIR ${UNSUBDIRS})
+    add_subdirectory (${CMAKE_SOURCE_DIR}/${UNSUBDIR})
+  endforeach()
+endif()
 
 # samples do not support patch usage
-IF (BUILD_Samples)
-  SET (CMAKE_MFC_FLAG 2)
+IF (BUILD_MFC_SAMPLES)
   SET (OCCT_ROOT ${CMAKE_SOURCE_DIR})
 
   SET (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
   SET (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
 
-  subdirs(samples/mfc/standard/mfcsample)
-  subdirs(samples/mfc/standard/01_Geometry)
-  subdirs(samples/mfc/standard/02_Modeling)
-  subdirs(samples/mfc/standard/03_Viewer2d)
-  subdirs(samples/mfc/standard/04_Viewer3d)
-  subdirs(samples/mfc/standard/05_ImportExport)
-  subdirs(samples/mfc/standard/06_Ocaf)
-  subdirs(samples/mfc/standard/07_Triangulation)
-  subdirs(samples/mfc/standard/08_HLR)
-  subdirs(samples/mfc/standard/09_Animation)
-  subdirs(samples/mfc/standard/10_Convert)
+  add_subdirectory(samples/mfc/standard/mfcsample)
+  add_subdirectory(samples/mfc/standard/01_Geometry)
+  add_subdirectory(samples/mfc/standard/02_Modeling)
+  add_subdirectory(samples/mfc/standard/03_Viewer2d)
+  add_subdirectory(samples/mfc/standard/04_Viewer3d)
+  add_subdirectory(samples/mfc/standard/05_ImportExport)
+  add_subdirectory(samples/mfc/standard/06_Ocaf)
+  add_subdirectory(samples/mfc/standard/07_Triangulation)
+  add_subdirectory(samples/mfc/standard/08_HLR)
+  add_subdirectory(samples/mfc/standard/09_Animation)
+  add_subdirectory(samples/mfc/standard/10_Convert)
 ENDIF()

adm/UDLIST

@@ -1,22 +1,18 @@
-n IncludeLibrary
 n NCollection
 p BSplCLib
 p BSplSLib
 p Bnd
+p BVH
 p CSLib
 p Convert
 p Dico
-p Dynamic
 p ElCLib
 p ElSLib
 p Expr
 p ExprIntrp
 p FSD
 p GeomAbs
-p GraphDS
-p GraphTools
 p MMgt
-p Materials
 p Message
 p OSD
 p PLib
@@ -39,7 +35,6 @@ p UnitsAPI
 p gp
 p math
 r OS
-t TKAdvTools
 t TKMath
 t TKernel
 p Adaptor2d
@@ -110,7 +105,7 @@ p BRepGProp
 p BRepIntCurveSurface
 p BRepLib
 p BRepMAT2d
-p BRepMesh
+n BRepMesh
 p BRepOffset
 p BRepOffsetAPI
 p BRepPrim
@@ -132,9 +127,7 @@ p FairCurve
 p FilletSurf
 p GccAna
 p GccEnt
-p GccGeo
 p GccInt
-p GccIter
 p Geom2dAPI
 p Geom2dGcc
 p Geom2dHatch
@@ -170,7 +163,6 @@ p MAT
 p MAT2d
 p NLPlate
 p Plate
-p Primitives
 p ShapeAlgo
 p ShapeAnalysis
 p ShapeBuild
@@ -190,7 +182,7 @@ p TopOpeBRepBuild
 p TopOpeBRepDS
 p TopOpeBRepTool
 p TopTrans
-p XBRepMesh
+n XBRepMesh
 t TKBO
 t TKBool
 t TKFeat
@@ -210,7 +202,6 @@ p DsgPrs
 p Graphic3d
 p Image
 p MeshVS
-p NIS
 p OpenGl
 p Prs3d
 p PrsMgr
@@ -229,7 +220,6 @@ p Cocoa
 r Textures
 r Shaders
 t TKMeshVS
-t TKNIS
 t TKOpenGl
 t TKService
 t TKV3d
@@ -253,48 +243,8 @@ p BinObjMgt
 p BinTools
 p CDF
 p CDM
-p DBC
 p FWOSDriver
-p MDF
-p MDataStd
-p MDataXtd
-p MDocStd
-p MFunction
-p MNaming
-p MPrsStd
-p MgtBRep
-p MgtGeom
-p MgtGeom2d
-p MgtPoly
-p MgtTopLoc
-p MgtTopoDS
-p ObjMgt
-p PBRep
 p PCDM
-p PCDMShape
-p PColPGeom
-p PColPGeom2d
-p PColStd
-p PColgp
-p PCollection
-p PDF
-p PDataStd
-p PDataXtd
-p PDocStd
-p PFunction
-p PGeom
-p PGeom2d
-p PMMgt
-p PNaming
-p PPoly
-p PPrsStd
-p PShort
-p PStandard
-p PTColStd
-p PTopLoc
-p PTopoDS
-p StdDrivers
-p StdLDrivers
 p TDF
 p TDataStd
 p TDataXtd
@@ -315,9 +265,6 @@ p XmlMPrsStd
 p XmlObjMgt
 r StdResource
 r XmlOcafResource
-s ShapeSchema
-s StdLSchema
-s StdSchema
 t FWOSPlugin
 t PTKernel
 t TKBin
@@ -326,12 +273,7 @@ t TKBinTObj
 t TKCAF
 t TKCDF
 t TKLCAF
-t TKPCAF
-t TKPLCAF
 t TKPShape
-t TKShapeSchema
-t TKStdLSchema
-t TKStdSchema
 t TKTObj
 t TKXml
 t TKXmlL
@@ -365,9 +307,7 @@ p IGESSolid
 p IGESToBRep
 p Interface
 p LibCtl
-p MXCAFDoc
 p MoniTool
-p PXCAFDoc
 p RWHeaderSection
 p RWStepAP203
 p RWStepAP214
@@ -413,7 +353,6 @@ p VrmlConverter
 p VrmlData
 p XCAFApp
 p XCAFDoc
-p XCAFDrivers
 p XCAFPrs
 p XSAlgo
 p XSControl
@@ -422,7 +361,6 @@ p XmlXCAFDrivers
 r SHMessage
 r XSMessage
 r XSTEPResource
-s XCAFSchema
 t TKBinXCAF
 t TKIGES
 t TKSTEP
@@ -432,7 +370,6 @@ t TKSTEPBase
 t TKSTL
 t TKVRML
 t TKXCAF
-t TKXCAFSchema
 t TKXDEIGES
 t TKXDESTEP
 t TKXSBase
@@ -485,4 +422,10 @@ p Font
 p BOPAlgo
 p BOPDS
 p BOPCol
-p BOPInt
+p IVtk
+p IVtkOCC
+p IVtkVTK
+p IVtkTools
+t TKIVtk
+p IVtkDraw
+t TKIVtkDraw

adm/gendoc.tcl

@@ -684,7 +684,7 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
       foreach tk [$module:toolkits] {
         foreach pk [split [OCCDoc_GetPackagesList [OCCDoc_Locate $tk $productsPath]]] {
           if { [llength $pk] != "{}" } {
-            lappend filelist [OCCDoc_GetHeadersList "p" "pubinclude" "$pk" "$productsPath"]
+            lappend filelist [OCCDoc_GetHeadersList "p" "$pk" "$productsPath"]
           }
         }
       }

adm/occaux.tcl

@@ -537,26 +537,15 @@ proc OCCDoc_GetModulesList { {theProductsDir ""} } {
 }
 
 # Returns list of desired files in the specified location
-proc OCCDoc_GetHeadersList { theDesiredContent theFileType thePackageName {theProductsDir ""} } {
+proc OCCDoc_GetHeadersList { theDesiredContent thePackageName {theProductsDir ""} } {
+
+  # Get list of header files with path
+  set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "${thePackageName}.hxx" "${thePackageName}_*.hxx"]]
 
-  # Get file type
-  set file_type_pattern "*.*"
-  if { $theFileType == "pubinclude" } {
-    set file_type_pattern "*.*"
-  } elseif { $theFileType == "privinclude" } {
-    set file_type_pattern "*.ixx"
-  }
-  
   # Get content according to desired type ('p' for path and 'f' for filenames only)
   if { $theDesiredContent == "p" } {
-
-    # Get list of files with path
-    set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "$thePackageName$file_type_pattern"]]
-
     return $files_list
   } elseif { $theDesiredContent == "f" } {
-  # Get list of files without path
-    set files_list [split [glob -nocomplain -type f -directory "[OCCDoc_GetIncDir $theProductsDir]" "$thePackageName$file_type_pattern"]]
 
     # Cut paths from filenames
     foreach file $files_list {
@@ -662,7 +651,7 @@ proc OCCDoc_MakeMainPage {outDir outFile modules {theProductsDir ""} } {
     set u [OCCDoc_GetNameFromPath $pk]
     puts $fd "/**"
     puts $fd "\\page [string tolower $package_prefix$u] Package $u"
-    foreach hdr [lsort [OCCDoc_GetHeadersList "f" "pubinclude" "$pk" "$theProductsDir"]] {
+    foreach hdr [lsort [OCCDoc_GetHeadersList "f" "$pk" "$theProductsDir"]] {
       if { ! [regexp {^Handle_} $hdr] && [regexp {(.*)[.]hxx} $hdr str obj] } {
         puts $fd "\\li \\subpage $obj"
       }

adm/templates/3rdparty_macro.cmake

@@ -0,0 +1,194 @@
+#
+
+# include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+
+macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEBUG)
+
+  OCCT_MAKE_BUILD_POSTFIX()
+
+  # 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()
+
+  # 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()
+  endif()
+
+  if (NOT DEFINED INSTALL_${PRODUCT_NAME})
+    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} required to be copied into install directory")
+  endif()
+
+  # 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)
+
+    # first of all, search for debug version of a library if build type is debug
+    if (DEFINED IS_BUILD_DEBUG)
+      find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME_DEBUG}
+                                                     PATHS 
+                                                      "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}"
+                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib"
+                                                      "${3RDPARTY_${PRODUCT_NAME}_DIR}/libd"
+                                                      ${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_DEBUG})
+    endif()
+
+    # if build type is release or debug version of library isn't found - search for release version of one
+    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)
+
+      if (DEFINED IS_BUILD_DEBUG)
+        message (STATUS "Warning: debug version of ${PRODUCT_NAME} library isn't found (${LIBRARY_NAME_DEBUG}) in ${3RDPARTY_${PRODUCT_NAME}_DIR}/lib(d). Search for release one")
+      endif()
+
+      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()
+  endif()
+  
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR)
+    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)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+    
+    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()
+
+    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)
+
+      if (DEFINED IS_BUILD_DEBUG)
+        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME_DEBUG}"
+                                                   PATHS
+                                                    "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}"
+                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/bin"
+                                                    "${3RDPARTY_${PRODUCT_NAME}_DIR}/bind"
+                                                    ${3RDPARTY_${PRODUCT_NAME}_ADDITIONAL_PATH_FOR_DLL}
+                                                   NO_DEFAULT_PATH)
+        
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME_DEBUG}")
+      endif()
+
+      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)
+
+        if (DEFINED IS_BUILD_DEBUG)
+          message (STATUS "Warning: debug version of ${PRODUCT_NAME} dll isn't found (${LIBRARY_NAME_DEBUG}) in ${3RDPARTY_${PRODUCT_NAME}_DIR}/bin(d). Search for release one")
+        endif()
+
+        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)
+        
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${PRODUCT_NAME}_DLL "${LIBRARY_NAME}")
+      endif()
+    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()
+  
+  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+  endif()
+
+  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)
+  endif()
+
+  if (WIN32)
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL}")
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR)
+    endif()
+  endif()
+
+  if (INSTALL_${PRODUCT_NAME})
+    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
+    OCCT_MAKE_BUILD_POSTFIX()
+
+    if (WIN32)
+      install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+    else()
+      install (FILES "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    endif()
+
+    set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
+  else()
+    # the library directory for using by the executable
+    if (WIN32)
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR}")
+    else()
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
+    endif()
+  endif()
+  
+  mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY 3RDPARTY_${PRODUCT_NAME}_DLL)
+endmacro()

adm/templates/custom.bat.in

@@ -2,12 +2,14 @@ echo off
 
 if "%VCVER%" == "@COMPILER@" (
   if "%ARCH%" == "@COMPILER_BITNESS@" (
-    if "%CASDEB%" == "@BUILD_SUFFIX@" (
-      set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
-      set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
-      set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@"
-      set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@"
-      set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
+    if "%CASDEB%" == "@BUILD_POSTFIX@" (
+      set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
+      set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
+      set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
+      set "FREEIMAGEPLUS_DIR=@USED_3RDPARTY_FREEIMAGEPLUS_DIR@"
+      set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIR@"
+      set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
+      set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
     )
   ) 
 )

adm/templates/custom.bat.main

@@ -8,5 +8,5 @@ if /I ["%3"]     == ["debug"] set "CASDEB=d"
 if /I ["%3"]     == ["d"]     set "CASDEB=d"
 
 rem include other custom.bat files with specific 3rdparty paths
-@CUSTOM_ADD_CONTENT@
+@ADDITIONAL_CUSTOM_CONTENT@
 

adm/templates/custom.sh.in

@@ -2,12 +2,13 @@
 
 if [ "$COMPILER" == "@COMPILER@" ]; then
   if [ "$ARCH" == "@COMPILER_BITNESS@" ]; then
-    if [ "$CASDEB" == "@BUILD_SUFFIX@" ]; then
-      export TCL_DIR="@3RDPARTY_TCL_DLL_DIR@"
-      export FREETYPE_DIR="@3RDPARTY_FREETYPE_DLL_DIR@"
-      export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_DLL_DIR@"
-      export GL2PS_DIR="@3RDPARTY_GL2PS_DLL_DIR@"
-      export TBB_DIR="@3RDPARTY_TBB_DLL_DIR@"
+    if [ "$CASDEB" == "@BUILD_POSTFIX@" ]; then
+      export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
+      export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
+      export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIR@"
+      export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIR@"
+      export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
+      export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
     fi
   fi
 fi

adm/templates/custom.sh.main

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-@CUSTOM_ADD_CONTENT@
+@ADDITIONAL_CUSTOM_CONTENT@
 

adm/templates/env.bat.in

@@ -5,7 +5,7 @@ set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
 
 set "VCVER=@COMPILER@"
 set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB=@BUILD_SUFFIX@"
+set "CASDEB=@BUILD_POSTFIX@"
 
 if not ["%1"]    == [""]      set "VCVER=%1"
 if not ["%2"]    == [""]      set "ARCH=%2"
@@ -22,11 +22,13 @@ if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
 
 set "ORIGIN_PATH=%PATH%"
 
-if not ["%TCL_DIR%"] == [""]       set "PATH=%TCL_DIR%;%PATH%"
-if not ["%FREETYPE_DIR%"] == [""]  set "PATH=%FREETYPE_DIR%;%PATH%"
-if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
-if not ["%GL2PS_DIR%"] == [""]     set "PATH=%GL2PS_DIR%;%PATH%"
-if not ["%TBB_DIR%"] == [""]       set "PATH=%TBB_DIR%;%PATH%"
+if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
+if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
+if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
+if not ["%FREEIMAGEPLUS_DIR%"] == [""] set "PATH=%FREEIMAGEPLUS_DIR%;%PATH%"
+if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
+if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
+if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 
 rem ----- Set path to 3rd party and OCCT libraries -----
 set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"

adm/templates/env.sh.in

@@ -8,7 +8,7 @@ fi
 
 # Read script arguments
 shopt -s nocasematch
-export CASDEB="@BUILD_SUFFIX@";
+export CASDEB="@BUILD_POSTFIX@";
 if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
 if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
 shopt -u nocasematch
@@ -57,6 +57,10 @@ if [ "$TBB_DIR" != "" ]; then
   THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
 fi
 
+if [ "$VTK_DIR" != "" ]; then
+  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
+fi
+
 BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
 LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
 

adm/templates/freeimage.cmake

@@ -0,0 +1,3 @@
+#freeimage
+
+THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "freeimage" "freeimaged")

adm/templates/freeimageplus.cmake

@@ -0,0 +1,9 @@
+#freeimageplus
+
+if (WIN32)
+  if (3RDPARTY_FREEIMAGE_DIR AND NOT 3RDPARTY_FREEIMAGEPLUS_DIR)
+    set (3RDPARTY_FREEIMAGEPLUS_DIR "${3RDPARTY_FREEIMAGE_DIR}" CACHE PATH "The directory containing freeimageplus" FORCE)
+  endif()
+
+  THIRDPARTY_PRODUCT("FREEIMAGEPLUS" "FreeImagePlus.h" "freeimageplus" "freeimageplusd")
+endif()

adm/templates/freetype.cmake

@@ -0,0 +1,242 @@
+# freetype
+
+if (NOT DEFINED INSTALL_FREETYPE)
+  set (INSTALL_FREETYPE OFF CACHE BOOL "Is freetype required to be copied into install directory")
+endif()
+
+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 and build_postfix
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+
+OCCT_MAKE_COMPILER_SHORT_NAME()
+OCCT_MAKE_COMPILER_BITNESS()
+
+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()
+
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
+  endif()
+endif()
+
+if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
+endif()
+
+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)
+  set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library")
+endif()
+
+if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
+  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)
+    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 FILEPATH "The directory containing freetype shared library")
+  endif()
+endif()
+
+message (STATUS "Info: CMake default freetype search start...")
+find_package(Freetype)
+message (STATUS "Info: CMake default freetype search end")
+
+# 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()
+
+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
+  message (STATUS "Info: CMake default search doesn't found FREETYPE_INCLUDE_DIR_freetype2")
+  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)
+  
+  if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is NOT found by additional search")
+  else()
+    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is found by additional search")
+  endif()
+elseif (FREETYPE_INCLUDE_DIR_freetype2 OR EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    get_filename_component (3RDPARTY_FREETYPE_DIR_ABS "${3RDPARTY_FREETYPE_DIR}" ABSOLUTE)
+    get_filename_component (FREETYPE_INCLUDE_DIR_freetype2_ABS "${FREETYPE_INCLUDE_DIR_freetype2}" ABSOLUTE)
+
+    string (REGEX MATCH "${3RDPARTY_FREETYPE_DIR_ABS}" DOES_PATH_CONTAIN "${FREETYPE_INCLUDE_DIR_freetype2_ABS}")
+
+    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)
+
+      if (TMP_FREETYPE2 OR NOT EXISTS "${TMP_FREETYPE2}")
+        set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "${TMP_FREETYPE2}" CACHE FILEPATH "the path of freetype2" FORCE)
+        
+        # hide and remove TMP_FREETYPE2
+        mark_as_advanced (TMP_FREETYPE2)
+        unset (TMP_FREETYPE2)
+      endif()
+    endif()
+  endif()
+endif()
+
+# 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()
+
+# 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 (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_DLL_DIR)
+  endif()
+endif()
+
+if (INSTALL_FREETYPE)
+
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_BUILD_POSTFIX()
+
+  if (WIN32)
+    install (FILES "${3RDPARTY_FREETYPE_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+  else()
+    install (FILES "${3RDPARTY_FREETYPE_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+  endif()
+
+  set (USED_3RDPARTY_FREETYPE_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
+  endif()
+endif()
+
+# unset all redundant variables
+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)

adm/templates/gl2ps.cmake

@@ -0,0 +1,3 @@
+#GL2PS
+
+THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "gl2ps" "gl2psd")

adm/templates/glx.cmake

@@ -0,0 +1,3 @@
+# glx
+
+THIRDPARTY_PRODUCT("GLX" "GL/glx.h" "GL" "GLd")

adm/templates/occt_defs_flags.cmake

@@ -0,0 +1,68 @@
+
+if (MSVC)
+  add_definitions(/fp:precise)
+endif()
+
+# set compiler short name and choose SSE2 option for appropriate MSVC compilers
+# ONLY for 32-bit
+if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+  if (MSVC80 OR MSVC90 OR MSVC10)
+    add_definitions(/arch:SSE2)
+  endif()
+endif()
+
+add_definitions (-DCSFDB)
+if (WIN32)
+  add_definitions (/DWNT -wd4996)
+elseif (APPLE)
+  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
+else()
+  add_definitions (-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
+endif()
+
+# enable structured exceptions for MSVC
+string (REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
+if (ISFLAG)
+  string (REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+elseif (WIN32)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
+endif()
+
+# remove DEBUG flag if it exists
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
+if (IS_DEBUG_CXX)
+  message (STATUS "-DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+endif()
+
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
+if (IS_DEBUG_C)
+  message (STATUS "-DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+endif()
+
+# enable parallel compilation on MSVC 9 and above
+if (MSVC AND NOT MSVC70 AND NOT MSVC80)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
+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, -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)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+endif()
+
+set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEB")
+set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEB")

adm/templates/occt_macros.cmake

@@ -0,0 +1,201 @@
+#
+
+macro (OCCT_CHECK_AND_UNSET VARNAME)
+  if (DEFINED ${VARNAME})
+    unset (${VARNAME} CACHE)
+  endif()
+endmacro()
+
+macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_INCLUDE_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
+
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+endmacro()
+
+# BUILD_POSTFIX, IS_BUILD_DEBUG variables
+macro (OCCT_MAKE_BUILD_POSTFIX)
+  if ("${BUILD_CONFIGURATION}" STREQUAL "Debug")
+    set (BUILD_POSTFIX "d")
+    set (IS_BUILD_DEBUG "")
+  else()
+    set (BUILD_POSTFIX "")
+    OCCT_CHECK_AND_UNSET (IS_BUILD_DEBUG)
+  endif()
+endmacro()
+
+# COMPILER_BITNESS variable
+macro (OCCT_MAKE_COMPILER_BITNESS)
+  math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
+endmacro()
+
+# OS_WITH_BIT
+macro (OCCT_MAKE_OS_WITH_BITNESS)
+
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  if (WIN32)
+    set (OS_WITH_BIT "win${COMPILER_BITNESS}")
+  elseif(APPLE)
+    set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
+  else()
+    set (OS_WITH_BIT "lin${COMPILER_BITNESS}")
+  endif()
+endmacro()
+
+# COMPILER variable
+macro (OCCT_MAKE_COMPILER_SHORT_NAME)
+  if (MSVC)
+    if (MSVC70)
+      set (COMPILER vc7)
+    elseif (MSVC80)
+      set (COMPILER vc8)
+    elseif (MSVC90)
+      set (COMPILER vc9)
+    elseif (MSVC10)
+      set (COMPILER vc10)
+    elseif (MSVC11)
+      set (COMPILER vc11)
+    elseif (MSVC12)
+      set (COMPILER vc12)
+    endif()
+  elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
+    set (COMPILER gcc)
+  elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+    set (COMPILER gxx)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set (COMPILER clang)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    set (COMPILER icc)
+  else()
+    set (COMPILER ${CMAKE_GENERATOR})
+    string (REGEX REPLACE " " "" COMPILER ${COMPILER})
+  endif()
+endmacro()
+
+function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
+  file (GLOB SUB_ITEMS "${MAIN_DIRECTORY}/*")
+
+  foreach (ITEM ${SUB_ITEMS})
+    if (IS_DIRECTORY "${ITEM}")
+      get_filename_component (ITEM_NAME "${ITEM}" NAME)
+      list (APPEND LOCAL_RESULT "${ITEM_NAME}")
+    endif()
+  endforeach()
+  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
+endfunction()
+
+function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  string (TOLOWER "${PRODUCT_NAME}" 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)
+
+  foreach (SEARCH_TEMPLATE ${SEARCH_TEMPLATES})
+    if (LOCAL_RESULT)
+      BREAK()
+    endif()
+
+    foreach (SUBDIR_NAME ${SUBDIR_NAME_LIST})
+      string (TOLOWER "${SUBDIR_NAME}" lower_SUBDIR_NAME)
+
+      string (REGEX MATCH "${SEARCH_TEMPLATE}" DUMMY_VAR "${lower_SUBDIR_NAME}")
+      if (DUMMY_VAR)
+        list (APPEND LOCAL_RESULT ${SUBDIR_NAME})
+      endif()
+    endforeach()
+  endforeach()
+
+  if (LOCAL_RESULT)
+    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()
+
+macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
+    if (IS_DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}")
+      # first of all, install original files
+      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+
+      # secondly, rewrite original files with patched ones
+      install (DIRECTORY "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    else()
+      install (FILES     "${BUILD_PATCH_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    endif()
+  else()
+    if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}")
+      install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    else()
+      install (FILES     "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+    endif()
+  endif()
+endmacro()
+
+macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE FINAL_NAME DESTINATION_PATH)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  endif()
+
+  install(FILES "${OCCT_BINARY_DIR}/${FINAL_NAME}" DESTINATION  "${DESTINATION_PATH}")
+endmacro()
+
+function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
+  set (${USE_PRODUCT} OFF PARENT_SCOPE)
+  
+  if (NOT USED_TOOLKITS)
+    message(STATUS "Warning: the list of being used toolkits is empty")
+  else()
+    foreach (USED_TOOLKIT ${USED_TOOLKITS})
+      if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
+        file (READ "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
+      elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB")
+        file (READ "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}/EXTERNLIB" FILE_CONTENT)
+      endif()
+
+      string (REGEX MATCH "${CSF_VAR_NAME}" DOES_FILE_CONTAIN "${FILE_CONTENT}")
+
+      if (DOES_FILE_CONTAIN)
+        set (${USE_PRODUCT} ON PARENT_SCOPE)
+        break()
+      endif()
+    endforeach()
+  endif()
+endfunction()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

adm/templates/opencl.cmake

@@ -0,0 +1,27 @@
+#OpenCl
+
+SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
+                                                  $ENV{INTELOCLSDKROOT}/include
+                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
+                                                  $ENV{ATISTREAMSDKROOT}/include)
+
+
+IF(${COMPILER_BITNESS} STREQUAL 32)
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
+                                               $ENV{INTELOCLSDKROOT}/lib/x86
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86)
+ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
+                                               $ENV{INTELOCLSDKROOT}/lib/x64
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86_64)
+ENDIF()
+
+THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL" "OpenCLd")
+
+# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
+# then try to find OpenCL/cl.h (all other variable won't be changed)
+IF(NOT 3RDPARTY_OPENCL_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_OPENCL_INCLUDE_DIR}")
+  THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL" "OpenCLd")
+ENDIF()

adm/templates/tbb.cmake

@@ -1,109 +1,250 @@
-# Find tbb includes and libraries
-  
-  IF(${COMPILER_BITNESS} STREQUAL 32)
-    SET (TBB_ARCH_NAME ia32)
-  ELSE()
-    SET (TBB_ARCH_NAME intel64)
-  ENDIF()
-  
-  IF(NOT DEFINED 3RDPARTY_TBB_DIR)
-    SET(3RDPARTY_TBB_DIR "" CACHE PATH "Directory contains tbb product")
-  ENDIF()
-  
-  SET(3RDPARTY_TBB_DIR_NAME "")
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_TBB_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" "TBB" 3RDPARTY_TBB_DIR_NAME)
-    IF("${3RDPARTY_TBB_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "TBB DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${3RDPARTY_TBB_DIR_NAME}" CACHE PATH "Directory contains tbb product" FORCE)
-    ENDIF()
-  ENDIF()
-  
-  SET(INSTALL_TBB OFF CACHE BOOL "Is tbb lib copy to install directory")
+# tbb
 
-  IF(3RDPARTY_TBB_DIR)
-    IF("${3RDPARTY_TBB_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE PATH "Directory contains headers of the tbb product" FORCE)
-      FIND_PATH(3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
-    ENDIF()
+OCCT_MAKE_BUILD_POSTFIX()
 
-    SET(TBB_DEBUG_POSTFIX "")
-    if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-      SET(TBB_DEBUG_POSTFIX "_debug")
-    ENDIF()
+if (NOT DEFINED INSTALL_TBB)
+  set (INSTALL_TBB OFF CACHE BOOL "Is tbb required to be copied into install directory")
+endif()
+
+# tbb directory
+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 (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
+  set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
+endif()
+
+# include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
+OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+
+# 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()
+
+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")
+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()
+
+OCCT_MAKE_BUILD_POSTFIX()
+
+# search for tbb and tbb malloc library in defined 3rdparty directory
+foreach (LIBRARY_NAME TBB TBBMALLOC)
+  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()
+
+  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)
+
+    # first of all, search for debug version of a library if build type is debug
+    if (DEFINED IS_BUILD_DEBUG)
+      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME}_debug
+                                                     PATHS
+                                                      "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
+                                                      "${3RDPARTY_TBB_DIR}/libd/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                                      "${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}_debug)
+    endif()
+
+    # if build type is release or debug version of library isn't found - search for release version of one
+    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)
+
+      if (DEFINED IS_BUILD_DEBUG)
+        message (STATUS "Warning: debug version of ${LIBRARY_NAME} library isn't found (${LIBRARY_NAME}_debug) in ${3RDPARTY_TBB_DIR}/lib(d). Search for release one")
+      endif()
+
+      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${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()
+  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)
+    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
+  endif()
+
+  # search for dll in defined 3rdparty directory (just for win case)
+  if (WIN32)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
     
-    IF("${3RDPARTY_TBB_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TBB_LIBRARY}" STREQUAL "3RDPARTY_TBB_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_TBB_LIBRARY "3RDPARTY_TBB_LIBRARY-NOTFOUND" CACHE PATH "Directory contains library of the tbb product" FORCE)
-      FIND_LIBRARY(3RDPARTY_TBB_LIBRARY tbb${TBB_DEBUG_POSTFIX} PATHS "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_LIBRARY}" STREQUAL "3RDPARTY_TBB_LIBRARY-NOTFOUND")
-        FIND_LIBRARY(3RDPARTY_TBB_LIBRARY tbb${TBB_DEBUG_POSTFIX})
-      ENDIF()
-    ENDIF()
+    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("${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_TBB_MALLOC_LIBRARY "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND" CACHE PATH "Directory contains library of the tbb malloc product" FORCE)
-      FIND_LIBRARY(3RDPARTY_TBB_MALLOC_LIBRARY tbbmalloc${TBB_DEBUG_POSTFIX} PATHS "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND")
-        FIND_LIBRARY(3RDPARTY_TBB_MALLOC_LIBRARY tbbmalloc${TBB_DEBUG_POSTFIX})
-      ENDIF()
-    ENDIF()
-    
-    
-    
-    IF("${3RDPARTY_TBB_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_DLL "3RDPARTY_TBB_DLL-NOTFOUND" CACHE PATH "Directory contains shared library of the tbb product" FORCE)
-      FIND_FILE(3RDPARTY_TBB_DLL "${DLL_SO_PREFIX}tbb${TBB_DEBUG_POSTFIX}.${DLL_SO}" PATHS "${3RDPARTY_TBB_DIR}/${DLL_SO_FOLDER}/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_DLL}" STREQUAL "3RDPARTY_TBB_DLL-NOTFOUND")
-        FIND_FILE(3RDPARTY_TBB_DLL "${DLL_SO_PREFIX}tbb${TBB_DEBUG_POSTFIX}.${DLL_SO}")
-      ENDIF()
-    ENDIF()
-    
-    IF("${3RDPARTY_TBB_MALLOC_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_MALLOC_DLL "3RDPARTY_TBB_MALLOC_DLL-NOTFOUND" CACHE PATH "Directory contains shared library of the tbb malloc product" FORCE)
-      FIND_FILE(3RDPARTY_TBB_MALLOC_DLL "${DLL_SO_PREFIX}tbbmalloc${TBB_DEBUG_POSTFIX}.${DLL_SO}" PATHS "${3RDPARTY_TBB_DIR}/${DLL_SO_FOLDER}/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_MALLOC_DLL}" STREQUAL "3RDPARTY_TBB_MALLOC_DLL-NOTFOUND")
-        FIND_FILE(3RDPARTY_TBB_MALLOC_DLL "${DLL_SO_PREFIX}tbbmalloc${TBB_DEBUG_POSTFIX}.${DLL_SO}")
-      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)
 
-    MARK_AS_ADVANCED(3RDPARTY_TBB_DIR_NAME)
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_DIR)
-  ENDIF()
+      if (DEFINED IS_BUILD_DEBUG)
+        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME}_debug
+                                       PATHS
+                                        "${3RDPARTY_${LIBRARY_NAME}_DLL_DIR}"
+                                        "${3RDPARTY_TBB_DIR}/bind/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                        "${3RDPARTY_TBB_DIR}/bin/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
+                                       NO_DEFAULT_PATH)
 
-  IF(3RDPARTY_TBB_INCLUDE_DIR)
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_TBB_INCLUDE_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-  ENDIF()
+        # second search if previous one do not find anything
+        find_library (3RDPARTY_${LIBRARY_NAME}_DLL ${LIBRARY_NAME}_debug)
+      endif()
 
-  IF(3RDPARTY_TBB_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_LIBRARY_DIR "${3RDPARTY_TBB_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_TBB_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_LIBRARY)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_MALLOC_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_LIBRARY_DIR "${3RDPARTY_TBB_MALLOC_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_TBB_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_MALLOC_LIBRARY)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_DLL)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_MALLOC_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_MALLOC_DLL)
-  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)
+
+        if (DEFINED IS_BUILD_DEBUG)
+          message (STATUS "Warning: debug version of ${LIBRARY_NAME} dll isn't found (${LIBRARY_NAME}_debug) in ${3RDPARTY_TBB_DIR}/bin(d). Search for release one")
+        endif()
+
+        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()
+    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)
+endif()
+
+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 3RDPARTY_${LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_DLL}")
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBRARY_NAME}_DLL_DIR)
+    endif()
+  endif()
+endforeach()
+
+# 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} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+  else()
+    install (FILES ${3RDPARTY_TBB_LIBRARY} ${3RDPARTY_TBBMALLOC_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+  endif()
+
+  set (USED_3RDPARTY_TBB_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
+  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/templates/tcl.cmake

@@ -1,163 +1,342 @@
-# - Find Tcl includes and libraries
+# tcl
 
-IF(WIN32)
-  SET(TCL_SEP "")
+if (NOT DEFINED INSTALL_TCL)
+  set (INSTALL_TCL OFF CACHE BOOL "Is tcl lib required to be copied into install directory")
+endif()
 
-  GET_FILENAME_COMPONENT(ActiveTcl_CurrentVersion 
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]" NAME)
+# tcl directory
+if (NOT DEFINED 3RDPARTY_TCL_DIR)
+  set (3RDPARTY_TCL_DIR "" CACHE PATH "The directory containing tcl")
+endif()
 
-ELSE()
-  SET(TCL_SEP ".")
-ENDIF()
+# tcl include directory
+if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
+  set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
+endif()
 
-IF(NOT DEFINED 3RDPARTY_TCL_DIR)
-  SET(3RDPARTY_TCL_DIR "" CACHE PATH "Directory contains TCL product")
-ENDIF()
+# tk include directory
+if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
+  set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
+endif()
 
-IF(3RDPARTY_DIR AND ("${3RDPARTY_TCL_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
+# tcl library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
+  set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "tcl library"  FORCE)
+endif()
+
+# tcl library directory
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY_DIR)
+  set (3RDPARTY_TCL_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tcl library")
+endif()
+
+# tk library file (with absolute path)
+if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
+  set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "tk library" FORCE)
+endif()
+
+# tk library directory
+if (NOT DEFINED 3RDPARTY_TK_LIBRARY_DIR)
+  set (3RDPARTY_TK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tk library")
+endif()
+
+# tcl shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TCL_DLL OR NOT 3RDPARTY_TCL_DLL_DIR)
+    set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "tcl shared library" FORCE)
+  endif()
+endif()
+
+# tcl shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TCL_DLL_DIR)
+  set (3RDPARTY_TCL_DLL_DIR "" CACHE FILEPATH "The directory containing tcl shared library")
+endif()
+
+# tk shared library (with absolute path)
+if (WIN32)
+  if (NOT DEFINED 3RDPARTY_TK_DLL OR NOT 3RDPARTY_TK_DLL_DIR)
+    set (3RDPARTY_TK_DLL "" CACHE FILEPATH "tk shared library" FORCE)
+  endif()
+endif()
+
+# tk shared library directory
+if (WIN32 AND NOT DEFINED 3RDPARTY_TK_DLL_DIR)
+  set (3RDPARTY_TK_DLL_DIR "" CACHE FILEPATH "The directory containing tk shared library")
+endif()
+
+# search for tcl in user defined directory
+if (NOT 3RDPARTY_TCL_DIR AND 3RDPARTY_DIR)
   FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tcl TCL_DIR_NAME)
-  IF("${TCL_DIR_NAME}" STREQUAL "")
-    MESSAGE(STATUS "\nInfo: tcl folder isn't found in ${3RDPARTY_DIR}. Start seeking in default folders")
-  ELSE()
-    SET(3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "Directory contains TCL product" FORCE)
-  ENDIF()
-ENDIF()
-  
-SET(INSTALL_TCL OFF CACHE BOOL "Is TCL lib copy to install directory")
+  if (TCL_DIR_NAME)
+    set (3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "The directory containing tcl" FORCE)
+  endif()
+endif()
 
-# include dir search
-IF("${3RDPARTY_TCL_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TCL_INCLUDE_DIR}" STREQUAL "3RDPARTY_TCL_INCLUDE_DIR-NOTFOUND")
-  SET(3RDPARTY_TCL_INCLUDE_DIR "3RDPARTY_TCL_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the TCL product" FORCE)
-  
-  IF(NOT "${3RDPARTY_TCL_DIR}" STREQUAL "")
-    FIND_PATH(3RDPARTY_TCL_INCLUDE_DIR tcl.h PATHS "${3RDPARTY_TCL_DIR}/include" NO_DEFAULT_PATH)
-  ELSE()
-    SET(3RDPARTY_TCL_POSSIBLE_INCLUDE_DIRS /usr/include
-                                           /usr/local/include
-                                           /usr/include/tcl8${TCL_SEP}6
-                                           /usr/include/tcl8${TCL_SEP}5)
-    IF(WIN32)
-      SET(3RDPARTY_TCL_POSSIBLE_INCLUDE_DIRS ${3RDPARTY_TCL_POSSIBLE_INCLUDE_DIRS}
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
-          "$ENV{ProgramFiles}/Tcl/include"
-          #"$ENV{ProgramFiles\(x86\)}/Tcl/include"
-          "C:/Program Files/Tcl/include"
-          "C:/Tcl/include")
-    ENDIF(WIN32)
+# define paths for default engine
+if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
+  set (TCL_INCLUDE_PATH "${3RDPARTY_TCL_DIR}/include")
+endif()
 
-    # check default path (with additions) for header search
-    FIND_PATH(3RDPARTY_TCL_INCLUDE_DIR tcl.h PATHS ${3RDPARTY_TCL_POSSIBLE_INCLUDE_DIRS})
+# check tcl/tk include dir, library dir and shared library dir
+macro (DIR_SUBDIR_FILE_FIT LIBNAME)
+  if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
+    # tcl/tk include dir
+    if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+      string (REGEX MATCH "${3RDPARTY_TCL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+      if (NOT DOES_PATH_CONTAIN)
+        set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
+      endif()
+    else()
+      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
+    endif()
     
-    #if find_path found something - set 3RDPARTY_TCL_DIR
-    IF(NOT "${3RDPARTY_TCL_INCLUDE_DIR}" STREQUAL "3RDPARTY_TCL_INCLUDE_DIR-NOTFOUND")
-      GET_FILENAME_COMPONENT (3RDPARTY_TCL_DIR "${3RDPARTY_TCL_INCLUDE_DIR}/../" ABSOLUTE)
-      SET(3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DIR} CACHE FILEPATH "Directory contains TCL product" FORCE)
-    ENDIF()
-  ENDIF()
-ENDIF()
+    # tcl/tk library dir
+    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+      
+      string (REGEX MATCH "${3RDPARTY_TCL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+      if (NOT DOES_PATH_CONTAIN)
+        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+      endif()
+    else()
+      set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+    endif()
 
-#library dir search
-IF("${3RDPARTY_TCL_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TCL_LIBRARY}" STREQUAL "3RDPARTY_TCL_LIBRARY-NOTFOUND")
-  SET(3RDPARTY_TCL_LIBRARY "3RDPARTY_TCL_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to library of the TCL product" FORCE)
+    # tcl/tk shared library dir
+    if (WIN32)
+      if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        string (REGEX MATCH "${3RDPARTY_TCL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        if (NOT DOES_PATH_CONTAIN)
+          set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
+        endif()
+      else()
+        set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
+      endif()
+    endif()
+  endif()
+
+  # check tcl/tk library
+  if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+    if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+      string (REGEX MATCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY}")
+
+      if (NOT DOES_PATH_CONTAIN)
+        set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+      endif()
+    else()
+      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+    endif()
+  else()
+    set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+  endif()
+
+  # check tcl/tk shared library
+  if (WIN32)
+    if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+      if (3RDPARTY_${LIBNAME}_DLL AND EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DLL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL}")
+
+        if (NOT DOES_PATH_CONTAIN)
+          set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+        endif()
+      else()
+        set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+      endif()
+    else()
+      set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+    endif()
+  endif()
+endmacro()
+
+
+DIR_SUBDIR_FILE_FIT(TCL)
+DIR_SUBDIR_FILE_FIT(TK)
+
+
+# use default (CMake) TCL search
+find_package(TCL)
+
+foreach (LIBNAME TCL TK)
+  string (TOLOWER "${LIBNAME}" LIBNAME_L)
+
+  # tcl/tk include dir
+  if (NOT 3RDPARTY_${LIBNAME}_INCLUDE_DIR)
+    if (${LIBNAME}_INCLUDE_PATH AND EXISTS "${${LIBNAME}_INCLUDE_PATH}")
+      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "${${LIBNAME}_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
+    endif()
+  endif()
+
+  # tcl/tk dir and library
+  if (NOT 3RDPARTY_${LIBNAME}_LIBRARY)
+    if (${LIBNAME}_LIBRARY AND EXISTS "${${LIBNAME}_LIBRARY}")
+      set (3RDPARTY_${LIBNAME}_LIBRARY "${${LIBNAME}_LIBRARY}" CACHE FILEPATH "${LIBNAME} library" FORCE)
+      
+      if (NOT 3RDPARTY_${LIBNAME}_LIBRARY_DIR)
+        get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY}" PATH)
+        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+      endif()
+    endif()
+  endif()
   
-  IF(NOT "${3RDPARTY_TCL_DIR}" STREQUAL "")
-    FIND_LIBRARY(3RDPARTY_TCL_LIBRARY
-                 NAMES tcl8${TCL_SEP}6 tcl8${TCL_SEP}5 tcl
-                 PATHS "${3RDPARTY_TCL_DIR}/lib" NO_DEFAULT_PATH)
-  ELSE()
-    SET(3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS /usr/lib /usr/local/lib)
+
+  if (WIN32)
+    if (NOT 3RDPARTY_${LIBNAME}_DLL)
+        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+        set (DLL_FOLDER_FOR_SEARCH "")
+        if (3RDPARTY_${LIBNAME}_DLL_DIR)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        elseif (3RDPARTY_TCL_DIR)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+        elseif (3RDPARTY_${LIBNAME}_LIBRARY_DIR)
+          get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" PATH)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT}/bin")
+        endif()
+        
+        set (3RDPARTY_${LIBNAME}_DLL "3RDPARTY_${LIBNAME}_DLL-NOTFOUND" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+        find_library (3RDPARTY_${LIBNAME}_DLL NAMES ${LIBNAME_L}86 ${LIBNAME_L}85
+                                              PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                              NO_DEFAULT_PATH)
+    endif()
+  endif()
+
+  DIR_SUBDIR_FILE_FIT(${LIBNAME})
+  
+
+  # tcl/tk dir and library
+  if (NOT 3RDPARTY_${LIBNAME}_LIBRARY)
+    set (3RDPARTY_${LIBNAME}_LIBRARY "3RDPARTY_${LIBNAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "${LIBNAME} library" FORCE)
+    find_library (3RDPARTY_${LIBNAME}_LIBRARY NAMES ${LIBNAME_L}8.6 ${LIBNAME_L}86 ${LIBNAME_L}8.5 ${LIBNAME_L}85
+                                              PATHS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}"
+                                              NO_DEFAULT_PATH)
     
-    IF(WIN32)
-      SET(3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS ${3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS}
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
-        "$ENV{ProgramFiles}/Tcl/Lib"
-        "C:/Program Files/Tcl/lib" 
-        "C:/Tcl/lib" )
-    ENDIF()
+    # search in another place if previous search doesn't find anything
+    find_library (3RDPARTY_${LIBNAME}_LIBRARY NAMES ${LIBNAME_L}8.6 ${LIBNAME_L}86 ${LIBNAME_L}8.5 ${LIBNAME_L}85 
+                                              PATHS "${3RDPARTY_TCL_DIR}/lib"
+                                              NO_DEFAULT_PATH)    
     
-    # check default path (with additions) for library search
-    FIND_LIBRARY(3RDPARTY_TCL_LIBRARY
-                 NAMES tcl8${TCL_SEP}6 tcl8${TCL_SEP}5 tcl
-                 PATHS ${3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS})
-  ENDIF()
-ENDIF()
 
-#search the version of found tcl library
-IF("${3RDPARTY_TCL_LIBRARY}" STREQUAL "" OR "${3RDPARTY_TCL_LIBRARY}" STREQUAL "3RDPARTY_TCL_LIBRARY-NOTFOUND")
-  SET (TCL_DLL_SO_NAMES ${DLL_SO_PREFIX}tcl8${TCL_SEP}6.${DLL_SO}
-                        ${DLL_SO_PREFIX}tcl8${TCL_SEP}5.${DLL_SO}
-                        ${DLL_SO_PREFIX}tcl.${DLL_SO})
-ELSE()
-  GET_FILENAME_COMPONENT(TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)
-
-  STRING(REGEX REPLACE "^.*tcl([0-9])[^0-9]*[0-9].*$" "\\1" TCL_MAJOR_VERSION "${TCL_LIBRARY_NAME}")
-  STRING(REGEX REPLACE "^.*tcl[0-9][^0-9]*([0-9]).*$" "\\1" TCL_MINOR_VERSION "${TCL_LIBRARY_NAME}")
-
-  IF (NOT "${TCL_MAJOR_VERSION}" STREQUAL "${TCL_LIBRARY_NAME}")
-    SET (IS_TCL_VERSION_FOUND ON)
-  ELSE()
-    SET (IS_TCL_VERSION_FOUND OFF)
-  ENDIF()
-  
-  IF (IS_TCL_VERSION_FOUND)
-    SET (TCL_DLL_SO_NAMES "${DLL_SO_PREFIX}tcl${TCL_MAJOR_VERSION}${TCL_SEP}${TCL_MINOR_VERSION}.${DLL_SO}")
-  ELSE()
-    MESSAGE(STATUS "\nWarning: Tcl version isn't found. ${DLL_SO_PREFIX}tcl.${DLL_SO} is used")
-    SET (TCL_DLL_SO_NAMES "${DLL_SO_PREFIX}tcl.${DLL_SO}")
-  ENDIF()
-ENDIF()
-
-#dll_so search
-IF("${3RDPARTY_TCL_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TCL_DLL}" STREQUAL "3RDPARTY_TCL_DLL-NOTFOUND")
-  SET(3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "Path to shared library of the TCL product" FORCE)
-  
-  IF(NOT "${3RDPARTY_TCL_DIR}" STREQUAL "")
-    FIND_FILE(3RDPARTY_TCL_DLL 
-              NAMES ${TCL_DLL_SO_NAMES}
-              PATHS "${3RDPARTY_TCL_DIR}/${DLL_SO_FOLDER}" NO_DEFAULT_PATH)
-  ELSE() 
-    SET(3RDPARTY_TCL_POSSIBLE_SO_DIRS /usr/lib /usr/local/lib)
+    if (NOT 3RDPARTY_${LIBNAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+    endif()
     
-    IF(WIN32)
-      SET(3RDPARTY_TCL_POSSIBLE_SO_DIRS ${3RDPARTY_TCL_POSSIBLE_SO_DIRS}
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
-        "$ENV{ProgramFiles}/Tcl/Bin"
-        "C:/Program Files/Tcl/bin" 
-        "C:/Tcl/b" )
-    ENDIF()
+    if (NOT 3RDPARTY_${LIBNAME}_LIBRARY_DIR AND 3RDPARTY_${LIBNAME}_LIBRARY)
+      get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY}" PATH)
+      set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+    endif()
+  endif()
+
+  set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION "")
+  if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+    get_filename_component (${LIBNAME}_LIBRARY_NAME "${3RDPARTY_${LIBNAME}_LIBRARY}" NAME)
+    string(REGEX REPLACE "^.*${LIBNAME_L}([0-9]\\.*[0-9]).*$" "\\1" ${LIBNAME}_LIBRARY_VERSION "${${LIBNAME}_LIBRARY_NAME}")
     
-    # check default path (with additions) for dll_so search
-    FIND_FILE(3RDPARTY_TCL_DLL 
-              NAMES ${TCL_DLL_SO_NAMES}
-              PATHS ${3RDPARTY_TCL_POSSIBLE_SO_DIRS})
-  ENDIF()
-ENDIF()
+    if (NOT "${${LIBNAME}_LIBRARY_VERSION}" STREQUAL "${${LIBNAME}_LIBRARY_NAME}")
+      set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION "${${LIBNAME}_LIBRARY_VERSION}")
+    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
+      message (STATUS "Info: ${LIBNAME} version isn't found")
+    endif()
+  endif()
   
-IF(NOT "${3RDPARTY_TCL_DIR}" STREQUAL "")
-  MARK_AS_ADVANCED(3RDPARTY_TCL_DIR)
-ENDIF()
 
-# #includes found paths to common variables
-IF(3RDPARTY_TCL_INCLUDE_DIR)
-  SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_TCL_INCLUDE_DIR}")
-ELSE()
-  LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_INCLUDE_DIR)
-ENDIF()
+  set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION_WITH_DOT "")
+  if (3RDPARTY_${LIBNAME}_LIBRARY_VERSION)
+    string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_${LIBNAME}_MAJOR_VERSION "${3RDPARTY_${LIBNAME}_LIBRARY_VERSION}")
+    string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_${LIBNAME}_MINOR_VERSION "${3RDPARTY_${LIBNAME}_LIBRARY_VERSION}")
+    set (3RDPARTY_${LIBNAME}_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_${LIBNAME}_MAJOR_VERSION}.${3RDPARTY_${LIBNAME}_MINOR_VERSION}")
+  endif()
 
-IF(3RDPARTY_TCL_LIBRARY)
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_TCL_LIBRARY_DIR}")
-ELSE()
-  LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_LIBRARY)
-ENDIF()
+  if (WIN32)
+    if (NOT 3RDPARTY_${LIBNAME}_DLL)
+        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+
+        set (DLL_FOLDER_FOR_SEARCH "")
+        if (3RDPARTY_${LIBNAME}_DLL_DIR)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        elseif (3RDPARTY_TCL_DIR)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+        else()
+          get_filename_component (3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" PATH)
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR_PARENT}/bin")
+        endif()
+        
+        set (3RDPARTY_${LIBNAME}_DLL "3RDPARTY_${LIBNAME}_DLL-NOTFOUND" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+        find_library (3RDPARTY_${LIBNAME}_DLL NAMES ${LIBNAME_L}${3RDPARTY_${LIBNAME}_LIBRARY_VERSION}
+                                              PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                              NO_DEFAULT_PATH)
+        
+        if (NOT 3RDPARTY_${LIBNAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+          set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+        endif()
+      
+        if (NOT 3RDPARTY_${LIBNAME}_DLL_DIR AND 3RDPARTY_${LIBNAME}_DLL)
+          get_filename_component (3RDPARTY_${LIBNAME}_DLL_DIR "${3RDPARTY_${LIBNAME}_DLL}" PATH)
+          set (3RDPARTY_${LIBNAME}_DLL_DIR "${3RDPARTY_${LIBNAME}_DLL_DIR}" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
+        endif()
+    endif()
+  endif()
   
-IF(3RDPARTY_TCL_DLL)
-ELSE()
-  LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_DLL)
-ENDIF()
+  # include found paths to common variables
+  if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBNAME}_INCLUDE_DIR)
+  endif()
+
+  if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBNAME}_LIBRARY_DIR})
+  endif()
+
+  if (WIN32)
+    if (NOT 3RDPARTY_${LIBNAME}_DLL OR NOT EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${LIBNAME}_DLL_DIR)
+    endif()
+  endif()
+endforeach()
+
+# install tcltk
+if (INSTALL_TCL)
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+
+  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_BUILD_POSTFIX()
+
+  if (WIN32)
+    install (FILES ${3RDPARTY_TCL_DLL} ${3RDPARTY_TK_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+  else()
+    install (FILES ${3RDPARTY_TCL_LIBRARY} ${3RDPARTY_TK_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+  endif()
+
+  if (TCL_TCLSH_VERSION)
+    # tcl is required to install in lib folder (without ${BUILD_POSTFIX})
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+  else()
+    message (STATUS "\nWarning: tclX.X and tkX.X subdirs won't be copyied during the installation process.")
+    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
+  endif()
+
+  set (USED_3RDPARTY_TCL_DIR "")
+else()
+  # the library directory for using by the executable
+  if (WIN32)
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
+  else()
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
+  endif()
+endif()
+
+mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TK_LIBRARY 3RDPARTY_TCL_DLL 3RDPARTY_TK_DLL)
+
+# unset all redundant variables
+#TCL
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+#TK
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_WISH)

adm/templates/vtk.cmake

@@ -0,0 +1,165 @@
+# vtk
+
+if (NOT DEFINED INSTALL_VTK)
+  set (INSTALL_VTK OFF CACHE BOOL "Is vtk required to be copied into install directory")
+endif()
+
+# vtk directory
+if (NOT DEFINED 3RDPARTY_VTK_DIR)
+  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 FILEPATH "The directory containing headers of vtk")
+endif()
+
+# vtk library directory
+if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
+  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 FILEPATH "The directory containing VTK dll")
+endif()
+
+# 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()
+
+# 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()
+
+OCCT_MAKE_BUILD_POSTFIX()
+set(VTK_VERSION "")
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+  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 (NOT 3RDPARTY_VTK_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
+    if(EXISTS "${3RDPARTY_VTK_DIR}/lib${BUILD_POSTFIX}")
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_DIR}/lib${BUILD_POSTFIX}" CACHE FILEPATH "The directory containing libs of VTK" FORCE)
+    else()
+	  if (NOT "${BUILD_POSTFIX}" STREQUAL "" AND 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()
+  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${BUILD_POSTFIX}")
+      set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin${BUILD_POSTFIX}" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+    else()
+	  if (NOT "${BUILD_POSTFIX}" STREQUAL "" AND EXISTS "${3RDPARTY_VTK_DIR}/bin")
+	    set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DIR}/bin" CACHE FILEPATH "The directory containing dll of VTK" FORCE)
+      endif()
+	endif()
+  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}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_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} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+        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}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME "lib${VTK_DLL_NAME}")
+    endforeach()
+  endif()
+
+  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()
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
+  endif()
+endif()
+
+mark_as_advanced (VTK_INCLUDE_DIRS VTK_LIBRARY_DIRS VTK_DIR)

dox/FILES_HTML.txt

@@ -9,6 +9,10 @@ overview/overview.md
 
 ../samples/mfc/standard/ReadMe.md
 ../samples/CSharp/ReadMe.md
+../samples/CSharp/ReadMe_D3D.md
+
+../samples/qt/AndroidQt/ReadMe.md
+../samples/java/jniviewer/ReadMe.md
 
 tutorial/tutorial.md
 
@@ -18,19 +22,21 @@ user_guides/user_guides.md
 user_guides/foundation_classes/foundation_classes.md
 user_guides/modeling_data/modeling_data.md
 user_guides/modeling_algos/modeling_algos.md
+user_guides/boolean_operations/boolean_operations.md
+user_guides/shape_healing/shape_healing.md
 user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
 user_guides/ocaf/ocaf.md
 user_guides/tobj/tobj.md
-user_guides/shape_healing/shape_healing.md
-user_guides/draw_test_harness.md
+user_guides/draw_test_harness/draw_test_harness.md
 user_guides/brep_wp/brep_wp.md
 user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md
 user_guides/ocaf_tree_wp/ocaf_tree_wp.md
 user_guides/ocaf_wp/ocaf_wp.md
 user_guides/voxels_wp/voxels_wp.md
+user_guides/vis/vis.md
 
 dev_guides/dev_guides.md
 dev_guides/documentation/documentation.md
@@ -49,8 +55,11 @@ dev_guides/building/3rdparty/3rdparty_osx.md
 dev_guides/building/wok/wok.md
 dev_guides/building/automake.md
 dev_guides/building/cmake/cmake.md
+dev_guides/building/android/android.md
 dev_guides/building/code_blocks.md
 dev_guides/building/msvc.md
 dev_guides/building/xcode.md
 
+dev_guides/upgrade/upgrade.md
+
 license.md

dox/FILES_PDF.txt

@@ -9,17 +9,19 @@ user_guides/foundation_classes/foundation_classes.md
 user_guides/iges/iges.md
 user_guides/modeling_data/modeling_data.md
 user_guides/modeling_algos/modeling_algos.md
+user_guides/boolean_operations/boolean_operations.md
+user_guides/shape_healing/shape_healing.md
 user_guides/ocaf/ocaf.md
 user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md
 user_guides/ocaf_tree_wp/ocaf_tree_wp.md
 user_guides/ocaf_wp/ocaf_wp.md
-user_guides/shape_healing/shape_healing.md
 user_guides/step/step.md
-user_guides/draw_test_harness.md
+user_guides/draw_test_harness/draw_test_harness.md
 user_guides/tobj/tobj.md
 user_guides/visualization/visualization.md
 user_guides/voxels_wp/voxels_wp.md
 user_guides/xde/xde.md
+user_guides/vis/vis.md
 
 dev_guides/contribution_workflow/contribution_workflow.md
 dev_guides/documentation/documentation.md

dox/dev_guides/building/3rdparty/3rdparty_linux.md

@@ -16,11 +16,12 @@ There are two types of third-party products, which are  necessary to build OCCT:
   
 * Mandatory  products: 
 	* Tcl/Tk 8.5 - 8.6;  
-	* FreeType 2.4.10 - 2.4.11;
+	* FreeType 2.4.10 - 2.5.3;
 * Optional  products: 
 	* TBB 3.x - 4.x;
 	* gl2ps 1.3.5 - 1.3.8;
-	* FreeImage 3.14.1 - 3.15.4.
+	* FreeImage 3.14.1 - 3.16.0;
+	* VTK 6.1.0.
 
 @section dev_guides__building_3rdparty_linux_2 Building Mandatory Third-party Products
 
@@ -28,22 +29,6 @@ There are two types of third-party products, which are  necessary to build OCCT:
 
 Tcl/Tk is required for DRAW test harness. 
 
-@subsubsection dev_guides__building_3rdparty_linux_2_1_1 Installation from binaries:
-
-It is possible to download ready-to-install binaries from 
-http://www.activestate.com/activetcl/downloads
-
-1. Download the binaries archive and unpack them to a directory, which is further referred to as *TCL_SRC_DIR*. 
-2. Enter the directory *TCL_SRC_DIR*.
-
-       cd TCL_SRC_DIR
-
-3. Run the install command:
-
-       install.sh
-    
-   and follow the instructions. 
-
 @subsubsection dev_guides__building_3rdparty_linux_2_1_2 Installation from sources: Tcl
   
 Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
@@ -120,7 +105,7 @@ Download the necessary archive from http://sourceforge.net/projects/freetype/fil
 @subsection dev_guides__building_3rdparty_linux_3_1 TBB
 
 This third-party product is  installed with binaries from the archive that can be downloaded from http://threadingbuildingblocks.org. 
-Go to the **Download** page, find the  release version you need and pick the archive for Linux  platform. 
+Go to the **Download** page, find the  release version you need and pick the archive for Linux platform.
 To install, unpack the downloaded archive of TBB product.
 
 @subsection dev_guides__building_3rdparty_linux_3_2 gl2ps
@@ -211,56 +196,49 @@ and unpack it. The directory with unpacked sources is  further referred to as *F
         make DESTDIR=FREEIMAGE_INSTALL_DIR  install   
 
 5. Clean temporary files
-  
-        make clean   
 
-@subsection dev_guides__building_3rdparty_linux_3_4 OpenCL ICD Loader
+        make clean
 
-If you have OpenCL SDK (one provided by Apple, AMD, NVIDIA, Intel, or other 
-vendor) installed on your system, you should find OpenCL headers and
-libraries required for building OCCT inside that SDK.
+@subsection dev_guides__building_3rdparty_linux_3_4 VTK
 
-Alternatively, you can use OpenCL ICD (Installable Client Driver) Loader 
-provided by Khronos group. The following describes steps used to build OpenCL 
-ICD Loader version 1.2.11.0.
+You can download VTK sources from http://www.vtk.org/VTK/resources/software.html
 
-1. Download OpenCL ICD Loader sources archive and OpenCL header files from 
-   Khronos OpenCL Registry
-   http://www.khronos.org/registry/cl/
+### The building procedure:
 
-2. Unpack the archive and put headers in *inc/CL* sub-folder
+Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it.
 
-3. Print *make* in the root of the unpacked archive to compile OpenCL libraries.
+1. Install or build *cmake* product from the source file.
+2. Start *cmake* in GUI mode with the directory where the source files of *VTK* are located:
 
-4. Create installation folder for OpenCL IDL Loader package and put there:
+       ccmake VTK_SRC_DIR
 
-    1. OpenCL header files in *include/CL* subfolder
+   * Press <i>[c]</i> to make the  initial configuration
+   * Define the necessary options in *VTK_INSTALL_PREFIX*
+   * Press <i>[c]</i> to make the final  configuration
+   * Press <i>[g]</i> to generate  Makefile and exit
 
-    2. *libOpenCL.so* (generated in *bin* subfolder of source package) in *lib* subfolder
+3. Start the building of VTK:
+
+       make
+
+4. Start the installation of gl2ps. Binaries will be  installed according to the *VTK_INSTALL_PREFIX* option.
+
+       make install
 
 @section dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
 
 @subsection dev_guides__building_3rdparty_linux_4_1 Debian-based distributives
 
-All 3rd-party products required for building of  OCCT could be installed 
-from official repositories. You may install them from  console using apt-get utility: 
+All 3rd-party products required for building of  OCCT could be installed
+from official repositories. You may install them from  console using apt-get utility:
 
-    sudo apt-get install \   
-    tcllib tklib tcl-dev tk-dev \   
-    libfreetype-dev \   
-    libxt-dev libxmu-dev \   
-    libgl1-mesa-dev \   
-    libfreeimage-dev \   
-    libtbb-dev \   
-    libgl2ps-dev   
-  
-To launch binaries built with WOK  you need to install C shell and 32-bit libraries on x86_64 distributives: 
-  
-    sudo apt-get install \   
-    csh \   
-    libstdc++5:i386 libxt6:i386   
+    sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev libgl2ps-dev
 
-Building is possible with any C++  compliant compiler : 
-  
-    sudo apt-get install \   
-    g++
+To launch binaries built with WOK you need to install C shell and 32-bit libraries on x86_64 distributives:
+
+    # you may need to add i386 if not done already by command "dpkg --add-architecture i386"
+    sudo apt-get install csh libstdc++6:i386 libxt6:i386 libxext6:i386 libxmu6:i386
+
+Building is possible with C++ compliant compiler:
+
+    sudo apt-get install g++

dox/dev_guides/building/3rdparty/3rdparty_osx.md

@@ -14,13 +14,12 @@ http://www.opencascade.org/getocc/require/</a>.
 There are two types of third-party products, which are  necessary to build OCCT: 
   
 * Mandatory  products: 
-	* Tcl 8.5, 
-	* Tk 8.5, 
-	* FreeType 2.4.10 
+	* Tcl/Tk 8.5 - 8.6;
+	* FreeType 2.4.10 - 2.5.3.
 * Optional  products: 
-	* TBB 3.x or 4.x, 
-	* gl2ps 1.3.5, 
-	* FreeImage 3.14.1 or 3.15.x 
+	* TBB 3.x - 4.x;
+	* gl2ps  1.3.5 - 1.3.8;
+	* FreeImage 3.14.1 - 3.16.0
   
 @section dev_guides__building_3rdparty_osx_2 Building Mandatory Third-party Products
 
@@ -28,15 +27,6 @@ There are two types of third-party products, which are  necessary to build OCCT:
 
 Tcl/Tk is required for DRAW test harness. Version 8.5 or  8.6 can be used with OCCT. 
 
-@subsubsection dev_guides__building_3rdparty_osx_2_1_1 Installation from binaries
-
-It is possible to download ready-to-install binaries from 
-http://www.activestate.com/activetcl/downloads   
-
-1. Download the disk image to a directory, which is further referred to as *TCL_DOWNLOAD_DIR*. 
-2. Open the directory *TCL_DOWNLOAD_DIR* in the Finder . 
-3. Open the disk image and follow the instructions. 
-
 @subsubsection dev_guides__building_3rdparty_osx_2_1_2 Installation from sources: Tcl 8.5
 
 Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 

dox/dev_guides/building/3rdparty/3rdparty_windows.md

@@ -12,11 +12,12 @@ The links for downloading the third-party products are available on the web site
 
 * Mandatory  products: 
 	* Tcl/Tk 8.5 - 8.6;
-	* FreeType 2.4.10 - 2.4.11.
+	* FreeType 2.4.10 - 2.5.3.
 * Optional  products:
 	* TBB 3.x - 4.x;
 	* gl2ps 1.3.5 - 1.3.8;
-	* FreeImage 3.14.1 -3.15.4.
+	* FreeImage 3.14.1 -3.16.0;
+	* VTK 6.1.0.
 
 It is recommended to create a separate new folder on your workstation, where you will unpack the downloaded archives of the third-party  products, and where you will build these products (for example, *c:\\occ3rdparty*). 
 
@@ -26,18 +27,69 @@ Further in this document, this folder is referred to as *3rdparty*.
 
 @subsection dev_guides__building_3rdparty_win_2_1 Tcl/Tk
 
-Tcl/Tk is required for DRAW test harness. We recommend installing a binary distribution that can be downloaded from http://www.activestate.com/activetcl.
+Tcl/Tk is required for DRAW test harness.
 
-Go to \"Free Downloads\" and pick the version of the Install Wizard 
-that matches your target platform – 32 bit (x86) or 64 bit (x64). 
-The version of Visual Studio you use is irrelevant when choosing the Install Wizard. 
+@subsubsection dev_guides__building_3rdparty_win_2_1_1 Installation from sources: Tcl
+  
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
+  
+1. In the *win* sub-directory, edit file *buildall.vc.bat*:
 
-Run the downloaded Install Wizard and install Tcl/Tk products :
+   * Edit the line "call ... vcvars32.bat" to have correct path to the version of Visual Studio to be used for building, for instance:
 
-* to *3rdparty\\tcltk-win32* folder (for 32-bit platform) or 
-* to *3rdparty\\tcltk-win64* folder (for 64-bit platform). 
+         call "%VS80COMNTOOLS%\vsvars32.bat"
 
-Further in this document,  this folder is referred to as *tcltk*. 
+     If you are building 64-bit version, set environment accordingly, e.g.:
+
+         call "%VS80COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
+     
+   * Define variable *INSTALLDIR* pointing to directory where Tcl/Tk will be installed, e.g.:
+
+         set INSTALLDIR=D:\OCCT\3rdparty\tcltk-86-32
+
+   * Add option *install* to the first command line calling *nmake*:
+
+         nmake -nologo -f makefile.vc release htmlhelp install %1
+
+   * Remove second call to *nmake* (building statically linked executable)
+
+2. Edit file *rules.vc* replacing line 
+
+       SUFX	    = tsgx
+
+   by
+
+       SUFX	    = sgx
+
+   This is to avoid extra prefix 't' in the library name, which is not recognized by default by OCCT build tools.
+
+
+3. By default, Tcl uses dynamic version of run-time library (MSVCRT), which must be installed on the system where Tcl will be used.
+   You may wish to link Tcl library with static version of run-time to avoid this dependency.
+   For that:
+
+   * Edit file *makefile.vc* replacing strings "crt = -MD" by "crt = -MT"
+
+   * Edit source file *tclMain.c* (located in folder *generic*) commenting out forward declaration of function *isatty()*.
+
+
+4. In the command prompt, run *buildall.vc.bat*
+
+   You might need to run this script twice to have *tclsh* executable installed; check subfolder *bin* of specified installation path to verify this.
+
+5. For convenience of use, we recommend making a copy of *tclsh* executable created in subfolder *bin* of *INSTALLDIR* and named with Tcl version number suffix, as *tclsh.exe* (with no suffix)
+
+       > cd D:\OCCT\3rdparty\tcltk-86-32\bin
+       > cp tclsh86.exe tclsh.exe
+
+@subsubsection dev_guides__building_3rdparty_win_2_1_2 Installation from sources: Tk
+  
+Download the necessary archive from http://www.tcl.tk/software/tcltk/download.html and unpack it. 
+
+Apply the same steps as described for building Tcl above, with the same INSTALLDIR.
+Note that Tk produces its own executable, called *wish*. 
+
+You might need to edit default value of *TCLDIR* variable defined in *buildall.vc.bat* (should be not necessary if you unpack both Tcl and Tk sources in the same folder).
 
 @subsection dev_guides__building_3rdparty_win_2_2 FreeType
 
@@ -258,35 +310,22 @@ http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
 
    As a result, you should have the  library files of FreeImage product  in *freeimage\\Dist* folder (*FreeImage.dll* and *FreeImage.lib*) and in *freeimage\\Wrapper\\FreeImagePlus\\dist* folder (*FreeImagePlus.dll* and *FreeImagePlus.lib*).
 
-@subsection dev_guides__building_3rdparty_win_opencl OpenCL ICD Loader
+@subsection dev_guides__building_3rdparty_win_3_4 VTK
 
-If you have OpenCL SDK (one provided by Apple, AMD, NVIDIA, Intel, or other 
-vendor) installed on your system, you should find OpenCL headers and
-libraries required for building OCCT inside that SDK.
+VTK is an open-source, freely available software system for 3D computer graphics, image processing and visualization. VTK Integration Services component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library.
 
-Alternatively, you can use OpenCL ICD (Installable Client Driver) Loader 
-provided by Khronos group. The following describes steps used to build OpenCL 
-ICD Loader version 1.2.11.0.
+### The building procedure:
 
-1. Download OpenCL ICD Loader sources archive and OpenCL header files from 
-   Khronos OpenCL Registry
-   http://www.khronos.org/registry/cl/
+1. Download the necessary archive from http://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
 
-2. Unpack the archive and put headers in *inc/CL* sub-folder
+   As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
 
-3. Use CMake to generate VS projects for building the library:
-   - Start CMake-GUI and select OpenCL ICD Loader folder as source path, and the folder of your choice for VS project and intermediate build data;
-   - Click **Generate**;
-   - Select the VS version to be used from the ones you have installed (we recommend using VS 2010) and the architecture (32- or 64-bit).
+   Further in this document, this folder is referred to as *VTK*.
 
-4. Open solution *OPENCL_ICD_LOADER.sln* generated in the build folder.
-   Though not strictly necessary, we recommend making two changes in the generated projects:
-   - Add file *OpenCL.rc* to project OpenCL, to have version and Khronos copyright correctly embedded in DLL;
-   - Change **Runtime library** to **Multi-threaded(/MT)** in the properties of OpenCL project, on **C/C++ / Code Generation** page for Release configuration, to avoid dependency on run-time DLL. 
-  
-5. Build project OpenCL in Release mode
+2. Use CMake to generate VS projects for building the library:
+   - Start CMake-GUI and select VTK folder as source path, and the folder of your choice for VS project and intermediate build data.
+   - Click **Configure**.
+   - Select the VS version to be used from the ones you have installed (we recommend using VS 2010) and the architecture (32 or 64-bit).
+   - Generate VS projects with default CMake options. The open solution *VTK.sln* will be generated in the build folder.
 
-6. Create the installation folder for OpenCL IDL Loader package and put there:
-   - OpenCL header files in *include/CL* subfolder;
-   - *OpenCL.dll* (generated in *bin/Release* subfolder of the source package) in *bin* subfolder;
-   - *OpenCL.lib* (generated in *Release* subfolder of the build directory) in *lib* subfolder.
+3. Build project VTK in Release mode.

dox/dev_guides/building/android/android.md

@@ -0,0 +1,71 @@
+Building with CMake and ADT for Android {#occt_dev_guides__building_android}
+===================
+
+@tableofcontents
+
+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
+
+## Generation of eclipse project files
+Run GUI tool provided by CMake: cmake-gui
+
+### Tools configuration
+  - Specify the root folder of OCCT (<i>$CASROOT</i>, which contains *CMakelists.txt* file) by clicking **Browse Source**.
+  - Specify the location (build folder) for Cmake generated project files by clicking **Browse Build**.
+
+@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. - 
+
+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 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}
+
+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 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
+
+How to configure OCCT, see "OCCT Configuration" section of @ref occt_dev_guides__building_cmake "Building with CMake"
+taking into account the specific configuration variables for android:
+  - ANDROID_ABI = armeabi-v7a
+  - ANDROID_NATIVE_API_LEVEL = 15
+  - 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 eclipse projects files
+
+Click **Generate** button and wait until the generation process is finished. 
+Then the eclipse project files will appear in the build folder (e.g. <i> D:/android-build-eclipse-api-15 </i>).
+
+## Building eclipse project files of OCCT
+
+  - 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/automake.md

@@ -1,71 +1,72 @@
 Building with Automake {#occt_dev_guides__building_automake}
 ======================
 
-This file describes steps to build OCCT libraries from complete source
-archive on Linux with GNU build system (Autotools).
+This file describes steps to build OCCT libraries from a complete source
+archive on Linux with **Autotools** GNU build system.
 
-If you are building OCCT from bare sources (as in Git repository), or do some 
+If you build OCCT from bare sources (as in Git repository), or do some 
 changes affecting CDL files, you need to use WOK to re-generate header files
 and build scripts / projects. See paragraph 1 \ref occt_dev_guides__building_wok for instructions.
 
-Before building OCCT, you need to install required third-party libraries; see paragraph 1 of 
+Before building OCCT, you need to install the required third-party libraries; see paragraph 1 of 
 \ref occt_dev_guides__building for instructions.
 
-Note that during compilation by makefiles on some Linux OS on a station with 
+Note that during compilation by makefiles on Linux station with 
 NVIDIA video card you may experience problems because the installation 
-procedure of NVIDIA video driver removes library libGL.so included in package 
-libMesaGL from directory /usr/X11R6/lib and places this library libGL.so in 
-directory /usr/lib. However, libtool expects to find the library in directory 
-/usr/X11R6/lib, which causes compilation crash (See /usr/X11R6/lib/libGLU.la). 
+procedure of NVIDIA video driver removes library *libGL.so* included in package 
+*libMesaGL* from directory <i>/usr/X11R6/lib</i> and places this library *libGL.so* in 
+directory <i>/usr/lib</i>. However, *libtool* expects to find the library in directory 
+<i>/usr/X11R6/lib</i>, which causes compilation crash (See <i>/usr/X11R6/lib/libGLU.la </i>). 
 
-To prevent this, suggest making links: 
+To prevent this, it is suggested to make links: 
 
- ln -s /usr/lib/libGL.so /usr/X11R6/lib/libGL.so 
- ln -s /usr/lib/libGL.la /usr/X11R6/lib/libGL.la 
 
-  1.In OCCT root folder, launch build_configure script 
+	ln -s /usr/lib/libGL.so /usr/X11R6/lib/libGL.so 
+	ln -s /usr/lib/libGL.la /usr/X11R6/lib/libGL.la 
 
-   This will generate files configure and Makefile.in for your system.
 
-  2.Go to the directory where OCCT will be built, and run configure to generate
-   makefiles.
+  1.In OCCT root folder, launch *build_configure* script to generate files *configure* and *Makefile.in* for your system.
 
-   $CASROOT/configure \<FLAGS\>
+  2.Go to the directory, where OCCT will be built, and run *configure* to generate makefiles.
 
-   Where \<FLAGS\> is a set of options.
+ 
+	$CASROOT/configure \<FLAGS\>
+
+   Where <i> \<FLAGS\> </i> is a set of options.
    The following flags are mandatory:
 
-   * --with-tcl=  defines location of tclConfig.sh
-   * --with-tk=  defines location of tkConfig.sh
-   * --with-freetype=  defines location of installed FreeType product
-   * --prefix= defines location for the installation of OCCT binaries
+   * <i> --with-tcl= </i> defines the location of *tclConfig.sh*;
+   * <i> --with-tk= </i> defines location of *tkConfig.sh*;
+   * <i> --with-freetype= </i> defines location of installed **FreeType** product
+   * <i> --prefix= </i> defines the location for installation of OCCT binaries
 
    Additional flags:
 
-   * --with-gl2ps=  defines location of installed gl2ps product
-   * --with-freeimage=  defines location of installed FreeImage product
-   * --with-tbb-include= defines location of tbb.h
-   * --with-tbb-library=  defines location of libtbb.so
-   * --with-opencl-include= defines location of cl.h
-   * --with-opencl-library= defines location of libOpenCL.so
-   * --enable-debug=       yes: includes debug information, no: does not include debug information
-   * --enable-production=   yes: switches code optimization, no: switches off code optimization
-   * --disable-draw - allows OCCT building without Draw.
+   * <i> --with-gl2ps= </i> defines the location of installed **gl2ps** product;
+   * <i> --with-freeimage= </i> defines the location of installed **FreeImage** product;
+   * <i> --with-tbb-include= </i> defines the location of *tbb.h*;
+   * <i> --with-tbb-library= </i> defines the location of *libtbb.so*;
+   * <i> --with-vtk-include= </i> defines the location of VTK includes;
+   * <i> --with-vtk-library= </i> defines the location of VTK libraries;
+   * <i> --enable-debug=   yes: </i>  includes debug information, no: does not include debug information;
+   * <i> --enable-production=   yes: </i> switches code optimization, no: switches off code optimization;
+   * <i> --disable-draw </i> allows OCCT building without Draw.
 
-   If location of FreeImage, TBB, gl2ps or OpenCL is not specified, OCCT will be
-   built without these optional libraries.
+   If location of **FreeImage, TBB, gl2ps** or **VTK** is not specified, OCCT will be built without these optional libraries.
 
    
-   Attention: 64-bit platforms are detected automatically.
+  Attention: 64-bit platforms are detected automatically.
 
-   Example:
+  Example:
+   
 
-   > ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 --with-opencl-include=/PRODUCTS/opencl-icd-1.2.11.0/include --with-opencl-library=/PRODUCTS/opencl-icd-1.2.11.0/lib
+  \>  ./configure -prefix=/PRODUCTS/occt-6.5.5 --with-tcl=/PRODUCTS/tcltk-8.5.8/lib --with-tk=/PRODUCTS/tcltk-8.5.8/lib --with-freetype=/PRODUCTS/freetype-2.4.10 --with-gl2ps=/PRODUCTS/gl2ps-1.3.5 --with-freeimage=/PRODUCTS/freeimage-3.14.1 --with-tbb-include=/PRODUCTS/tbb30_018oss/include --with-tbb-library=/PRODUCTS/tbb30_018oss/lib/ia32/cc4.1.0_libc2.4_kernel2.6.16.21 -–with-vtk-include=/PRODUCTS/VTK-6.1.0/include/vtk-6.1 –with-vtk-library=/PRODUCTS/ /VTK-6.1.0//lib
 
-  3.If configure exits successfully, you can build OCCT with make command.
 
-   > make -j8 install
+  3.If configure exits successfully, you can build OCCT with *make* command.
 
-To start DRAW, launch
+  \> make -j8 install
 
-   > draw.sh
+  4.To start *DRAW*, launch
+
+  \> draw.sh

dox/dev_guides/building/building.md

@@ -24,6 +24,7 @@ you need to:
 3. 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 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"

dox/dev_guides/building/cmake/cmake.md

@@ -3,24 +3,23 @@ Building with CMake {#occt_dev_guides__building_cmake}
 
 @tableofcontents
 
-This file describes steps to build OCCT libraries from complete source package
-with CMake. CMake is free software that can create GNU Makefiles, KDevelop, 
-XCode, and Visual Studio project files. Version 2.6 or above of CMake is 
+This file describes the steps to build OCCT libraries from a complete source package
+with **CMake**. CMake is free software that can create GNU Makefiles, KDevelop, 
+XCode, Eclipse and Visual Studio project files. **CMake** version 3.0 or above is 
 required.
 
-If you are building OCCT from bare sources (as in Git repository), or do some 
+If you build OCCT from bare sources (as in Git repository) or make some 
 changes affecting CDL files, you need to use WOK to re-generate header files
 and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions.
 
-Before building OCCT, you need to install required third-party libraries; see
+Before building OCCT, you need to install the required third-party libraries; see the
 instructions for your platform in @ref occt_dev_guides__building.
 
-## Decide on location of build and install directories.
+## Define the location of build and install directories.
 
-The build directory is the one where intermediate files will be created (projects / makefiles, objects, binaries).
-Each configuration to be built should have its own build directory.
+The build directory is where intermediate files (projects / makefiles, objects, binaries) will be created. Each built configuration should have its own build directory.
 
-The install directory is the one where binaries will be installed after build, along with header files and resources required for OCCT use in applications. 
+The install directory is where binaries will be installed after build, along with header files and resources required for OCCT use in applications. 
 It is possible to install several configurations of OCCT (differentiated by platform, bitness, compiler, and build type) into the same directory.
 
 It is recommended to separate build and install directories from OCCT source directory, for example:
@@ -31,195 +30,202 @@ It is recommended to separate build and install directories from OCCT source dir
 
 ## CMake usage
 
-Run CMake indicating path to OCCT sources ($CASROOT) and selected build directory.
+Run CMake indicating the path to OCCT sources <i>($CASROOT)</i> and selected build directory.
 
-It is recommended to use GUI tools provided by CMake: cmake-gui on Windows and Mac, ccmake or cmake-gui on Linux.
+It is recommended to use GUI tools provided by CMake: *cmake-gui* on Windows, Mac and Linux (*ccmake* also can be used on Linux).
 
 ### Windows:
 
-Specify the root folder of OCCT ($CASROOT, it contains CMakelists.txt file) by clicking Browse Source.
+Specify the root folder of OCCT (<i>$CASROOT</i>, which contains *CMakelists.txt* file) by clicking **Browse Source**.
 
 @figure{/dev_guides/building/cmake/images/cmake_image001.png}
 
-Specify location (build folder) for Cmake generated project files by clicking Browse Build.
-Each configuration of the project should be built in its own directory.
-When building multiple configurations it is recommended to compose name of build directories including system, bitness, compiler, and build type (e.g., d:/occt/build/win32-vc9-debug).
+Specify the location (build folder) for Cmake generated project files by clicking **Browse Build**.
 
-Configure opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click Finish.
+Each configuration of the project should be built in its own directory. When building multiple configurations it is recommended to indicate in the name of build directories the system, bitness, compiler, and build type (e.g., <i>d:/occt/build/win32-vc9-debug</i> ).
+
+**Configure** opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click **Finish**.
 
 @figure{/dev_guides/building/cmake/images/cmake_image002.png}
 
 ### Linux (ccmake variant):
 
-In the console, change to the build directory and call ccmake with the path to the source directory of the project:
+In the console, change to the build directory and call *ccmake* with the path to the source directory of the project:
 
        > cd ~/occt/build/debug
        > ccmake ~/occt
 
 @figure{/dev_guides/building/cmake/images/cmake_image003.png}
 
-Press "c" to configure.
+Press *c* to configure.
 
-Use of *cmake-gui* is the same as described above for Windows.
+*cmake-gui* is used in the same way as described above for Windows.
 
 ### Mac OS:
 
-Use cmake-gui (Applications -> CMake 2.8-10.app) to generate project files for the chosen build environment (e.g., XCode).
+Use *cmake-gui* **Applications -> CMake 2.8-10.app** to generate project files for the chosen build environment (e.g., XCode).
 
 @figure{/dev_guides/building/cmake/images/cmake_image004.png}
 
 ## OCCT Configuration
 
-The error message which appears at the end of configuration process, informs you about the required variables 
+The error message, which appears at the end of configuration process, informs you about the required variables, 
 which need to be defined. This error will appear until all required variables are defined correctly.
-Note: In cmake-gui there is "grouped" option, which groups variables with a common prefix.
 
-### Selection of components to be built
+Note: In *cmake-gui* there is "grouped" option, which groups variables with a common prefix.
 
-The variables with "BUILD_" prefix allow specifying OCCT components and
+### Selection of the components to be built
+
+The variables with <i>BUILD_</i> prefix allow specifying OCCT components and
 configuration to be built:
 
-* BUILD_CONFIGURATION - defines configuration to be built (Release by default).
-* BUILD_<MODULE>      - specify whether corresponding OCCT module should be 
-                        built (all toolkits). Note that even if whole module is not 
+* *BUILD_CONFIGURATION* - defines configuration to be built (Release by default).
+* <i>BUILD_<MODULE></i>      - specifies whether the corresponding OCCT module should be 
+                        built (all toolkits). Note that even if the whole module is not 
                         selected for build, its toolkits used by other toolkits 
                         selected for build will be included automatically.
-* BUILD_TOOLKITS      - allows including additional toolkits from non-selected 
+* *BUILD_TOOLKITS*      - allows including additional toolkits from non-selected 
                         modules (should be list of toolkit names separated by a 
                         space or a semicolon).
-* BUILD_SAMPLES       - specify whether OCCT MFC samples should be built.
-* BUILD_PATCH_DIR     - optionally specify additional folder containing patched OCCT source files.
+* *BUILD_SAMPLES*       - specifies whether OCCT MFC samples should be built.
+* *BUILD_PATCH_DIR*     - optionally specifies additional folder containing patched OCCT source files.
                         The patch may contain arbitrary subset of OCCT source files (including CMake scripts, templates, etc.), organized in the same structure of folders as OCCT.
-                        The projects generated by CMake will use files found in the patch folder instead of corresponding files of OCCT.
+                        The projects generated by CMake will use files found in the patch folder instead of the corresponding files of OCCT.
 
-Check variables with "USE_" prefix (USE_FREEIMAGE, USE_GL2PS, USE_TBB, and 
-USE_OPENCL) if you want to enable use of the corresponding optional 3rd-party 
+Check variables with <i>USE_</i> prefix (<i>USE_FREEIMAGE, USE_GL2PS, USE_TBB,</i> and 
+<i>USE_OPENCL</i>) if you want to enable use of the corresponding optional 3rd-party 
 library.
 
-### 3rd-party configuration (The variables with 3RDPARTY_ prefix)
+### 3rd-party configuration (The variables with <i>3RDPARTY_</i> prefix)
 
 If you have 3rd-party libraries in a non-default location 
-(e.g., on Windows, binaries downloaded from "http://www.opencascade.org/getocc/download/3rdparty/"), 
-specify 3RDPARTY_DIR variable that points to the folders of 3rdparty libraries (some or all). 
-At the next configuration step the 3rd-party libraries will be searched for in 3RDPARTY_DIR directory, and stored in 3RDPARTY_\<LIBRARY\>_DIR variables.
-The procedure expects to find binary and header files of each 3rd-party library in its own sub-directory, separated by sub-directories *bin*, *lib*, and *include*.
+(e.g., on Windows, binaries downloaded from http://www.opencascade.org/getocc/download/3rdparty/") 
+*3RDPARTY_DIR* variable should be specified with the path to the folders where required 3rd-party libraries will be sought
 
-Press "Configure" ("c" key for ccmake).
+The results of search for 3rd-party directories will be stored in *3RDPARTY_\<LIBRARY\>_DIR* variables. If *3RDPARTY_DIR* directory is defined, required libraries are sought in *3RDPARTY_DIR* location.
 
-The result of the 3rdparty product search will be recorded in the corresponding variables:
+The procedure expects to find binary and header files of each 3rd-party library in its own sub-directory: *bin*, *lib* and *include*.
 
-* 3RDPARTY_\<PRODUCT\>_DIR - path to the product directory (with directory name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32)
-* 3RDPARTY_\<PRODUCT\>_LIBRARY - path to the .lib libraries (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/lib/tcl85.lib). 
-  In non-windows case, this variable is the same as 3RDPARTY_\<PRODUCT\>_DLL.
-* 3RDPARTY_\<PRODUCT\>_INCLUDE - path to the include directory that contains the required header file (with "include" name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/include including tcl.h)
-* 3RDPARTY_\<PRODUCT\>_DLL - path to the .dll/.so/.dylib library  (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/bin/tcl85.dll)
+Press **Configure** (**c** key for ccmake).
+
+The result of the search are recorded in the corresponding variables:
+
+* *3RDPARTY_\<PRODUCT\>_DIR* - path to the 3rdparty directory (with directory name) (e.g. <i>D:/3rdparty/tcltk-86-32</i>)
+* *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR* - path to directory containing a library (e.g. <i>D:/3rdparty/tcltk-86-32/lib</i>). 
+* *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* - path to the directory containing a header file (e.g., <i>D:/3rdparty/tcltk-86-32/include</i>)
+* *3RDPARTY_\<PRODUCT\>_DLL_DIR* - path to the directory containing a shared library (e.g., <i>D:/3rdparty/tcltk-86-32/bin</i>) This variable is able just in windows case
+
+
+Note: a libraries and include directories should be the children of product directory if the last one is defined.
 
 The search process is as follows:
 
-1. Common path: 3RDPARTY_DIR
-2. Path to particular 3rd-party library: 3RDPARTY_\<PRODUCT\>_DIR
+1. Common path: *3RDPARTY_DIR*
+2. Path to a particular 3rd-party library: *3RDPARTY_\<PRODUCT\>_DIR*
 3. Paths to headers and binaries:
-   1. 3RDPARTY_\<PRODUCT\>_INCLUDE
-   2. 3RDPARTY_\<PRODUCT\>_LIBRARY
-   3. 3RDPARTY_\<PRODUCT\>_DLL
+   1. *3RDPARTY_\<PRODUCT\>_INCLUDE_DIR*
+   2. *3RDPARTY_\<PRODUCT\>_LIBRARY_DIR*
+   3. *3RDPARTY_\<PRODUCT\>_DLL_DIR*
 
-If a variable of any level is not defined (empty or \<variable name\>-NOTFOUND) 
+If a variable of any level is not defined (empty or <i> \<variable name\>-NOTFOUND </i>) 
 and the upper level variable is defined, the content of the non-defined variable 
-will be searched for at the next configuration step. If search process in level 3 
-does not find the required files, it searches in default places also.
+will be sought at the next configuration step. If search process at level 3 does not find the required files, it seeks in default places.
 
-**Note**: the names of searched libraries and header files are hardcoded.
-Freetype search process tries to find ft2build.h file in 3RDPARTY_FREETYPE INCLUDE dir 
-and after that adds "3RDPARTY_FREETYPE_INCLUDE /freetype2" path to common includes if it exists. 
+Important: If *BUILD_CONFIGURATION* variable is changed, at the next configuration 
+*3RDPARTY_ variables* will be replaced by the search process result, except for the *3RDPARTY_DIR* variable.
 
-Important: If BUILD_CONFIGURATION variable is changed - at the next configuration 
-3RDPARTY_ variables will be replaced by the search process result, except for the 3RDPARTY_DIR variable.
-
-*Note*: CMake will produce an error after the configuration step until all required variables are defined correctly.
-If the search result (include path, or library path, or dll path) does not meet your expectations - 
-you can  change 3RDPARTY_\<PRODUCT\>_DIR variable, clear (if they are not empty) 
-3RDPARTY_\<PRODUCT\>_DLL, 3RDPARTY_\<PRODUCT\>_INCLUDE_DIR and 3RDPARTY_\<PRODUCT\>_LIBRARY variables 
+**Note** : CMake will produce an error after the configuration step until all required variables are defined correctly.
+If the search result (include path, or library path, or dll path) does not meet your expectations, 
+you can  change *3RDPARTY_\<PRODUCT\>_*_DIR variable*, clear (if they are not empty) 
+*3RDPARTY_\<PRODUCT\>_DLL_DIR, 3RDPARTY_\<PRODUCT\>_INCLUDE_DIR* and 3RDPARTY_\<PRODUCT\>_LIBRARY_DIR variables 
 (or clear one of them) and run the configuration process again. 
 
-At this time the search will be performed in the new identified directory 
-and the result will be recorded to empty variables (non-empty variables will not be replaced).
+At this time the search will be performed in the newly identified directory 
+and the result will be recorded to corresponding variables (replace old value if it is necessary).
 
-For example, (Linux case) 3RDPARTY_FREETYPE_DIR variable 
-
-    /PRODUCTS/maintenance/Mandriva2010/freetype-2.3.7
-
-can be changed to 
+For example, (Linux case) *3RDPARTY_FREETYPE_DIR* variable 
 
     /PRODUCTS/maintenance/Mandriva2010/freetype-2.4.10
 
-and the related variables: 3RDPARTY_FREETYPE_DLL, 3RDPARTY_FREETYPE_INCLUDE_DIR and  3RDPARTY_FREETYPE_LIBRARY will be cleared.
+can be changed to 
 
-@figure{/dev_guides/building/cmake/images/cmake_image005.png}
+    /PRODUCTS/maintenance/Mandriva2010/freetype-2.5.3
 
-During configuration process the cleaned variables will be filled with new found values.
+During the configuration process and the related variables (*3RDPARTY_FREETYPE_DLL_DIR*, *3RDPARTY_FREETYPE_INCLUDE_DIR* and *3RDPARTY_FREETYPE_LIBRARY_DIR*) will be filled with new found values
+
+**Note**: The names of searched libraries and header files are hard-coded. If there is the need to change their names,
+change appropriate cmake variables (edit CMakeCache.txt file or edit in cmake-gui in advance mode) without reconfiguration: *3RDPARTY_\<PRODUCT\>_INCLUDE* for include, *3RDPARTY_\<PRODUCT\>_LIB* for library and *3RDPARTY_\<PRODUCT\>_DLL* for shared library.
 
 ###The variables with INSTALL_ prefix:
 
-Define in INSTALL_DIR variable the path where will be placed built OCCT files (libraries, executables and headers).
-If INSTALL_\<PRODUCT\> variable is checked - 3rd-party products will be copied to the install directory.
+Define *INSTALL_DIR* variable as the path will be contain the built OCCT files (libraries, executables and headers)
+If <i>INSTALL_\<PRODUCT\></i> variable is checked, 3rd-party products will be copied to the install directory.
 
-#### At the end of the configuration process "configuring done" message will be shown and the generation process can be started.
+At the end of the configuration process "configuring done" message will be shown and the generation process can be started.
 
 ## OCCT Generation
 
-This will create makefiles or project files for your build system.
+This procedure will create makefiles or project files for your build system.
 
 ### Windows
 
-Click Generate button and wait until the generation process is finished. 
-Then the project files will appear in the build folder (e.g., d:/occt/build/win32-vc9-release). 
+Click **Generate** button and wait until the generation process is finished. 
+Then the project files will appear in the build folder (e.g. <i> d:/occt/build/win32-vc9-release </i>). 
 
 ### Linux
 
-When the configuration is complete, start the generation process by pressing "g".
-
-@figure{/dev_guides/building/cmake/images/cmake_image006.png}
+Click **Generate** button (if you use cmake-gui) or press **g** (for ccmake) to start the generation process.
 
 ### Mac OS X
 
-Click Generate button and wait until the generation process is finished. 
-Then the project files will appear in the build folder (e.g., /Developer/occt/build/XCode).
+Click **Generate** button and wait until the generation process is finished. 
+Then the project files will appear in the build folder (e.g. <i> /Developer/occt/build/XCode </i>).
 
 ## OCCT Building
 
-The install folder contains bin, inc, lib and res folders and a script to run DRAWEXE (draw.bat or draw.sh).
-"bin" contains executables, DLL (Windows) style shared libraries and pdb-files in OCCT debug version,.
-"lib" contains the import parts of DLL libraries.
-"inc" contains header files.
-"res" contains all required source files for OCCT.
+The install folder contains the scripts to run *DRAWEXE* (*draw.bat* or *draw.sh*) and samples (if its were built; (see below **MFC samples**)); the directory structure is follow:
+* **data**    - data files for OCCT (brep, iges, stp)
+* **inc**     - header files
+* **samples** - tcl sample files
+* **src**     - all required source files for OCCT
+* **tests**   - OCCT test suite
+* **win32/vc10/bind**> - example relative directory tree of binary files (3rdparty and occt)
+* **win32/vc9/lib**>   - example relative directory tree of libraries (3rdparty and occt)
 
 ### Windows (Visual studio)
 
-Go to the build folder, start the Visual Studio solution (OCCT.sln) and build it by clicking Build - Build Solution.
-When the building process finished, build the INSTALL project 
-(by default the build solution process skips the building of the INSTALL project) to move the above files to INSTALL_DIR. 
-For this in the solution explorer right click on the INSTALL project and select Project Only - Build Only INSTALL. 
+Go to the build folder, start the Visual Studio solution *OCCT.sln* and build it by clicking **Build -> Build Solution**.
+
+When the building process is finished, build the *INSTALL* project (by default the build solution process skips the building of the INSTALL project) to move the above files to *INSTALL_DIR*. 
+
+For this, right-click on the *INSTALL* project and select **Project Only -> Build Only** -> *INSTALL* in the solution explorer. 
 
 ### Linux (make)
-Change directory to binary dir and run make command
+
+Change directory to the directory with binaries and run *make* command
 
        > make 
 
-To copy all libraries, executables and chosen 3rd-party libraries run "make" command with "install" argument
+To copy all libraries, executables and chosen 3rd-party libraries run *make* command with *install* argument
 
        > make install
 
-This command will move the above files to INSTALL_DIR.
+This command will move the above files to *INSTALL_DIR*.
 
 ### Mac OS X (XCode)
 
-Go to the build folder, start the XCode solution (OCCT.xcodeproj) 
-and build it by clicking Build -> Build. 
-Please notice that XCode may have worst responsibility to user actions 
-due to sources processing at first start.
+Go to the build folder, start XCode solution *OCCT.xcodeproj* and build it by clicking **Build -> Build**. 
+Please notice that XCode may lag because it processes sources at the first start.
 
-When the building process finished, build the INSTALL project 
-(by default the build solution process skips the building of the INSTALL project) 
-to move the above files to INSTALL_DIR. 
-Notice that env.sh (configure PATH and DYLD_LIBRARY_PATH environment variables 
-as well as Draw Harness extra variables) and draw.sh (to launch DRAWEXE) will be created in target directory. 
+When the building process has finished, build the *INSTALL* project (by default the build solution process skips the building of *INSTALL* project) to move the above files to *INSTALL_DIR*. 
+Notice that *env.sh* (which configures *PATH* and *DYLD_LIBRARY_PATH* environment variables 
+as well as Draw Harness extra variables) and *draw.sh* (to launch *DRAWEXE* ) will be created in the target directory. 
+
+### MFC samples
+
+On Windows you can also build binaries of MFC samples together with OCCT. For this, activate **BUILD_Samples** check-box in CMake configuration dialog.
+
+@figure{/dev_guides/building/cmake/images/cmake_image007.png}
+
+Please take into account that MFC sample binaries will be installed  in the same folder as OCCT binaries during building of *INSTALL* project.
+To run an MFC sample use *sample.bat* launcher. The command format is: <i>sample.bat *SampleName*</i> (e.g. <i>sample.bat ImportExport</i>).

dox/dev_guides/building/code_blocks.md

@@ -1,64 +1,70 @@
 Building with Code::Blocks on Mac OS X {#occt_dev_guides__building_code_blocks}
 ======================================
 
-This file describes steps to build OCCT libraries from complete source package
-on Mac OS X with Code::Blocks.
+This file describes steps to build OCCT libraries from a complete source package
+on Mac OS X with **Code::Blocks**.
 
-If you are building OCCT from bare sources (as in Git repository), or do some 
+If you build OCCT from bare sources (as in Git repository) or do some 
 changes affecting CDL files, you need to use WOK to re-generate header files
 and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions.
 
-Before building OCCT, you need to install required third-party libraries; see
+Before building OCCT, you need to install the required third-party libraries; see
 paragraph 1 of \ref occt_dev_guides__building for details.
 
-1. Add paths to the mandatory 3rd-party products (Tcl/Tk and FreeType) in file 
-   custom.sh located in \<OCCT_ROOT_DIR\>. For this:
+1. Add paths to the mandatory 3rd-party products (**Tcl/Tk** and **FreeType**) in file 
+   *custom.sh* located in <i>\<OCCT_ROOT_DIR\></i>. For this:
 
-   1.1. Add paths to the includes in variable "CSF_OPT_INC";
+   1.1. Add paths to the includes in variable *CSF_OPT_INC*;
 
-   1.2. Add paths to the binary libraries in variable  "CSF_OPT_LIB64";
+   1.2. Add paths to the binary libraries in variable  *CSF_OPT_LIB64*;
    
    All paths should be separated by ":" symbol. 
 
-2. Add paths to the optional 3rd-party libraries (TBB, gl2ps and FreeImage) 
-   in the aforementioned environment variables "CSF_OPT_INC" and 
-   "CSF_OPT_LIB64" from file custom.sh.
+2. Add paths to the optional 3rd-party libraries (**TBB, gl2ps** and **FreeImage**) 
+   in the aforementioned environment variables *CSF_OPT_INC* and 
+   *CSF_OPT_LIB64* from file *custom.sh*.
 
    If you want to build OCCT without the optional libraries perform the 
    following steps:
 
    2.1 Disable unnecessary library in custom.sh by setting the corresponding 
-       variable HAVE_\<LIBRARY_NAME\> to "false". 
+       variable <i>HAVE_\<LIBRARY_NAME\></i> to *false*. 
 
-       export HAVE_GL2PS=false
+~~~~~	   
+export HAVE_GL2PS=false
+~~~~~
 
-   2.2 Remove this library from Linker settings in Code::Blocks for each project 
-       that uses it: right click on the required project, choose "Build options", 
-       go to "Linker settings" tab in the opened window , select unnecessary 
-       libraries and click "Delete" button.
+   2.2 Remove this library from Linker settings in **Code::Blocks** for each project 
+       that uses it: right click on the required project, choose **Build options**, 
+       go to **Linker settings** tab in the opened window , select unnecessary 
+       libraries and click **Delete** button.
 
 3. Open Terminal application
 
-4. Enter \<OCCT_ROOT_DIR\>:
+4. Enter <i> \<OCCT_ROOT_DIR\></i>:
 
+~~~~~
    cd \<OCCT_ROOT_DIR\>
+~~~~~
 
-5. To start Code::Blocks, run the command /codeblocks.sh
+5. To start **Code::Blocks**, run the command <i>/codeblocks.sh</i>
 
-6. To build all toolkits, click "Build->Build workspace" in the menu bar.
+6. To build all toolkits, click **Build->Build workspace** in the menu bar.
 
 
-To start DRAWEXE, which has been built with Code::Blocks on Mac OS X, perform 
+To start *DRAWEXE*, which has been built with **Code::Blocks** on Mac OS X, perform 
 the following steps:
 
-1. Open Terminal application
+1.Open Terminal application
 
-2. Enter \<OCCT_ROOT_DIR\>:
+2.Enter <i>\<OCCT_ROOT_DIR\></i>:
 
+~~~~~
    cd \<OCCT_ROOT_DIR\>
+~~~~~
 
-3. Run script
-
+3.Run the script
+~~~~~
    ./draw_cbp.sh cbp [d]
-
-   Option "d" is used if OCCT has been built in Debug mode.
+~~~~~
+   Option *d* is used if OCCT has been built in **Debug** mode.

dox/dev_guides/building/msvc.md

@@ -1,31 +1,35 @@
 Building with MS Visual C++ {#occt_dev_guides__building_msvc}
 ===========================
 
-This file describes steps to build OCCT libraries from complete source
-archive on Windows with MS Visual C++. 
+This file describes steps to build OCCT libraries from a complete source
+archive on Windows with <b>MS Visual C++</b>. 
 
-If you are building OCCT from bare sources (as in Git repository), or do some 
+If you build OCCT from bare sources (as in Git repository) or do some 
 changes affecting CDL files, you need to use WOK to re-generate header files
 and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions.
 
-Before building OCCT, you need to install required third-party libraries; see
+Before building OCCT, you need to install the required third-party libraries; see
 paragraph 1 of \ref occt_dev_guides__building for instructions.
 
-1. Edit file custom.bat to define environment: 
+1. Edit file *custom.bat* to define the environment: 
 
-   - VCVER - version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), 
-             and relevant VCVARS path
-   - ARCH - architecture (32 or 64), affects only PATH variable for execution
-   - HAVE_* - flags to enable or disable use of optional third-party products
+   - *VCVER* - version of Visual Studio (vc8, vc9, vc10, vc11 or vc12), 
+             and relevant *VCVARS* path
+   - *ARCH* - architecture (32 or 64), affects only *PATH* variable for execution
+   - <i>HAVE_*</i> - flags to enable or disable use of optional third-party products
    - CSF_OPT_* - paths to search for includes and binaries of all used 
                  third-party products
 
-2. Launch msvc.bat to start Visual Studio with all necessary environment 
+2. Launch *msvc.bat* to start Visual Studio with all necessary environment 
    variables defined.
 
-   Note: the MSVC project files are located in folders adm\\msvc\\vc[9-12].
-   Binaries are produced in win32 or win64 folders.
+   Note: the MSVC project files are located in folders <i>adm\\msvc\\vc[9-12]</i>.
+   Binaries are produced in *win32* or *win64* folders.
 
 3. Build with Visual Studio
 
-To start DRAW, launch draw.bat.
+   Note: If VTK was not installed on you computer and you are not interested in usage of 
+            OCCT VTK Integration Services (VIS) component you should exclude TKIVtk and TKIVtkDraw 
+            projects from process of compilation in the main menu  <b>Build / Configuration Manager</b>. 
+
+To start DRAW, launch *draw.bat*.

dox/dev_guides/building/xcode.md

@@ -1,71 +1,70 @@
 Building with Xcode {#occt_dev_guides__building_xcode}
 ===================
 
-This file describes steps to build OCCT libraries from complete source package
-on Mac OS X with Xcode.
+This file describes steps to build OCCT libraries from a complete source package
+on Mac OS X with **Xcode**.
 
-If you are building OCCT from bare sources (as in Git repository), or do some 
+If you build OCCT from bare sources (as in Git repository) or do some 
 changes affecting CDL files, you need to use WOK to re-generate header files
 and build scripts / projects. See \ref occt_dev_guides__building_wok for instructions.
 
-Before building OCCT, you need to install required third-party libraries; see
+Before building OCCT, you need to install the required third-party libraries; see
 paragraph 1 of \ref occt_dev_guides__building for details.
 
-1. Add paths to the mandatory 3rd-party products (Tcl/Tk and FreeType) 
-   in file custom.sh located in \<OCCT_ROOT_DIR\>. For this:
+1. Add paths to the mandatory 3rd-party products (**Tcl/Tk** and **FreeType**) 
+   in file *custom.sh* located in <i>\<OCCT_ROOT_DIR\> </i>. For this:
 
-   1.1. Add paths to the includes in variable "CSF_OPT_INC";
+   1.1. Add paths to the includes in variable *CSF_OPT_INC*;
 
-   1.2. Add paths to the binary libraries in variable  "CSF_OPT_LIB64";
+   1.2. Add paths to the binary libraries in variable  *CSF_OPT_LIB64*;
 
    All paths should be separated by ":" symbol. 
 
-2. Add paths to the optional 3rd-party libraries (TBB, gl2ps and FreeImage) 
-   in the aforementioned environment variables "CSF_OPT_INC" and 
-   "CSF_OPT_LIB64" from file custom.sh.
+2. Add paths to the optional 3rd-party libraries (**TBB, gl2ps** and **FreeImage**) 
+   in the aforementioned environment variables *CSF_OPT_INC* and *CSF_OPT_LIB64* from file *custom.sh*.
 
-   If you want to build OCCT without the optional libraries perform the 
-   following steps:
-
-   2.1 Disable unnecessary library in custom.sh by setting the corresponding 
-       variable HAVE_<LIBRARY_NAME> to "false". 
+   If you want to build OCCT without the optional libraries perform the following steps:
 
+   2.1 Disable unnecessary library in *custom.sh* by setting the corresponding 
+       variable <i>HAVE_<LIBRARY_NAME></i> to *false*. 
+~~~~~
        export HAVE_GL2PS=false
-
+~~~~~
    2.2 Remove this library from Project navigator in Xcode for each project that 
        uses it: choose the required project, right click on the unnecessary 
-       library and select "Delete" button.
+       library and select **Delete** button.
 
 3. Open Terminal application.
 
-4. Enter \<OCCT_ROOT_DIR\>:
-
+4. Enter <i>\<OCCT_ROOT_DIR\></i>:
+~~~~~
    cd \<OCCT_ROOT_DIR\>
+~~~~~
+5. To start **Xcode**, run command  <i>/xcode.sh</i>
 
-5. To start Xcode, run the command  /xcode.sh
+6. To build a certain toolkit, select it in **Scheme** drop-down list in Xcode 
+   toolbar, press **Product** in the menu and click **Build** button. 
 
-6. To build a certain toolkit, select it in "Scheme" drop-down list in Xcode 
-   toolbar, press "Product" in the menu and click "Build" button. 
-
-   To build the entire OCCT, create a new empty project (select "File -> 
-   New -> Project -> "Empty project" in the menu. Input the project name, 
-   e.g. "OCCT", click "Next" and "Create" buttons). Drag and drop the "OCCT" 
-   folder in the created "OCCT" project in the Project navigator. Select 
-   "File -> New -> Target -> Aggregate" in the menu. Enter the project name 
-   (e.g. "OCCT") and click "Finish". The "Build Phases" tab will open.  
+   To build the entire OCCT, create a new empty project (select **File -> 
+   New -> Project -> "Empty project** in the menu. Input the project name, 
+   e.g. *OCCT*, click **Next** and **Create** buttons). Drag and drop the *OCCT* 
+   folder in the created *OCCT* project in the Project navigator. Select 
+   **File -> New -> Target -> Aggregate** in the menu. Enter the project name 
+   (e.g. <i>OCCT</i>) and click **Finish**. The **Build Phases** tab will open.  
    Click "+" button to add the necessary toolkits to the target project. 
-   It is possible to select all toolkits by pressing "Command+A" combination. 
+   It is possible to select all toolkits by pressing **Command+A** combination. 
 
-To start DRAWEXE, which has been built with Xcode on Mac OS X, perform the following steps:
+To start *DRAWEXE*, which has been built with Xcode on Mac OS X, perform the following steps:
 
-1. Open Terminal application
-
-2. Enter \<OCCT_ROOT_DIR\>:
+1.Open Terminal application
 
+2.Enter <i>\<OCCT_ROOT_DIR\></i>:
+~~~~~
    cd \<OCCT_ROOT_DIR\>
+~~~~~
 
-3. Run script
-
+3.Run the script
+~~~~~
    ./draw_cbp.sh xcd [d]
-
-   Option "d" is used if OCCT has been built in Debug mode.
+~~~~~
+   Option *d* is used if OCCT has been built in **Debug** mode.

dox/dev_guides/contribution/coding_rules.md

@@ -296,19 +296,19 @@ Each descriptive block should contain at least a function name and purpose descr
 See the following example:
 
 ~~~~~{.cpp}
-// ----------------------------------------------
+// =======================================================================
 // function : TellMeSmthGood
 // purpose  : Gives me good news
-// ----------------------------------------------
+// =======================================================================
 void TellMeSmthGood()
 {
   ...
 }
 
-// ----------------------------------------------
+// =======================================================================
 // function : TellMeSmthBad
 // purpose  : Gives me bad news
-// ----------------------------------------------
+// =======================================================================
 void TellMeSmthBad()
 {
   ...
@@ -556,6 +556,41 @@ If a class has a destructor, an assignment operator or a copy constructor, it us
 
 A class with virtual function(s) ought to have a virtual destructor.
 
+### Overriding virtual methods
+
+Declaration of overriding method should contains specifiers "virtual" and "override"
+(using Standard_OVERRIDE alias for compatibility with old compilers).
+
+~~~~~{.cpp}
+class MyPackage_BaseClass
+{
+
+public:
+
+  Standard_EXPORT virtual Standard_Boolean Perform();
+
+};
+
+~~~~~{.cpp}
+class MyPackage_MyClass : public MyPackage_BaseClass
+{
+
+public:
+
+  Standard_EXPORT virtual Standard_Boolean Perform() Standard_OVERRIDE;
+
+};
+~~~~~
+
+This makes class definition more clear (virtual methods become highlighted).
+
+Declaration of interface using pure virtual functions protects against
+incomplete inheritance at first level, but does not help when method is overridden multiple times within nested inheritance
+or when method in base class is intended to be optional.
+
+And here "override" specifier introduces additional protection against situations when interface changes might be missed
+(class might contain old methods which will be never called).
+
 ### Default parameter value
 
 Do not redefine a default parameter value in an inherited function.

dox/dev_guides/contribution_workflow/contribution_workflow.md

@@ -204,7 +204,7 @@ The definition of the following attributes is obligatory:
   | Open                  | The issue is being processed.                                                |
   | Fixed                 | The issue has been successfully fixed.                                       |
   | Reopened              | The bug has been reopened because of insufficient fix or regression.         |
-  |                       | Unable to reproduceThe bug is not reproduced.                                |
+  | Unable to reproduce   | The bug is not reproduced.                                |
   | Not fixable           | The bug cannot be fixed because it is a bug of third party software, or because it requires more workload than it can be allowed.        |
   | Duplicate             | The bug for the same issue already exists in the tracker.                    |
   | Not a bug             | It is a normal behavior in accordance with the specification of the product  |

dox/dev_guides/debug/debug.md

@@ -7,6 +7,26 @@ Debugging tools and hints {#occt_dev_guides__debug}
 
 This manual describes facilities included in OCCT to support debugging, and provides some hints for more efficient debug.
 
+@section occt_debug_macro Compiler macro to enable extended debug messages
+
+Many OCCT algorithms can produce extended debug messages, usually printed to cout.
+These include messages on internal errors and special cases encountered, timing etc.
+In OCCT versions prior to 6.8.0 most of these messages were activated by compiler macro *DEB*, enabled by default in debug builds.
+Since version 6.8.0 this is disabled by default but can be enabled by defining compiler macro *OCCT_DEBUG*.
+
+To enable this macro on Windows when building with Visual Studio projects, edit file custom.bat and add the line:
+
+    set CSF_DEFINES=OCCT_DEBUG
+
+Some algorithms use specific macros for yet more verbose messages, usually started with OCCT_DEBUG_.
+These messages can be enabled in the same way, by defining corresponding macro.
+
+Note that some header files are modified when *OCCT_DEBUG* is enabled, hence binaries built with it enabled are not compatible with client code built without this option; this is not intended for production use.
+
+@section occt_debug_exceptions Calling JIT debugger on exception
+
+On Windows platform when using Visual Studio compiler there is a possibility to start the debugger automatically if an exception is caught in a program running OCCT. For this, set environment variable *CSF_DEBUG* to any value. Note that this feature works only if you enable OCCT exception handler in your application by calling *OSD::SetSignal()*.
+
 @section occt_debug_bop Self-diagnostics in Boolean operations algorithm
 
 In real-world applications modeling operations are often performed in a long sequence, while the user sees only the final result of the whole sequence. If the final result is wrong, the first debug step is to identify the offending operation to be debugged further. Boolean operation algorithm in OCCT provides a self-diagnostic feature which can help to do that step.
@@ -15,10 +35,6 @@ This feature can be activated by defining environment variable *CSF_DEBUG_BOP*,
 
 The diagnostic code checks validity of the input arguments and the result of each Boolean operation. When an invalid situation is detected, the report consisting of argument shapes and a DRAW script to reproduce the problematic operation is saved to the directory pointed by *CSF_DEBUG_BOP*.
 
-@section occt_debug_exceptions Calling JIT debugger on exception
-
-On Windows platform when using Visual Studio compiler there is a possibility to start the debugger automatically if an exception is caught in a program running OCCT. For this, set environment variable *CSF_DEBUG* to any value. Note that this feature works only if you enable OCCT exception handler in your application by calling *OSD::SetSignal()*.
-
 @section occt_debug_call Functions for calling from debugger
 
 Modern interactive debuggers provide the possibility to execute application code at a program break point. This feature can be used to analyse the temporary objects available only in the context of the debugged code. OCCT provides several global functions that can be used in this way.
@@ -43,8 +59,8 @@ const char* DBRep_Set (const char* theNameStr, void* theShapePtr)
 ~~~~~
 
 Sets the specified shape as a value of DRAW interpreter variable with the given name.
-- *theNameStr* – the DRAW interpreter variable name to set.
-- *theShapePtr* – a pointer to *TopoDS_Shape* variable.
+- *theNameStr* - the DRAW interpreter variable name to set.
+- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
 
 ~~~~~
 const char* DrawTrSurf_Set (const char* theNameStr, void* theHandlePtr)
@@ -53,10 +69,10 @@ const char* DrawTrSurf_SetPnt2d (const char* theNameStr, void* thePnt2dPtr)
 ~~~~~
 
 Sets the specified geometric object as a value of DRAW interpreter variable with the given name.
-- *theNameStr* – the DRAW interpreter variable name to set.
-- *theHandlePtr* – a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
-- *thePntPtr* – a pointer to the variable of type *gp_Pnt* to be set.
-- *thePnt2dPtr* – a pointer to the variable of type *gp_Pnt2d* to be set.
+- *theNameStr* - the DRAW interpreter variable name to set.
+- *theHandlePtr* - a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
+- *thePntPtr* - a pointer to the variable of type *gp_Pnt* to be set.
+- *thePnt2dPtr* - a pointer to the variable of type *gp_Pnt2d* to be set.
 
 All these functions are defined in *TKDraw* toolkit and return a string indicating the result of execution.
 
@@ -69,8 +85,8 @@ const char* BRepTools_Write (const char* theFileNameStr, void* theShapePtr)
 ~~~~~
 
 Saves the specified shape to a file with the given name.
-- *theFileNameStr* – the DRAW interpreter variable name to set.
-- *theShapePtr* – a pointer to *TopoDS_Shape* variable.
+- *theFileNameStr* - the name of the file where the shape is saved.
+- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
 
 ~~~~~
 const char* BRepTools_Dump (void* theShapePtr)
@@ -78,7 +94,17 @@ const char* BRepTools_DumpLoc (void* theShapePtr)
 ~~~~~
 
 Dumps shape or its location to cout.
-- *theShapePtr* – a pointer to *TopoDS_Shape* variable.
+- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
+
+The following function is provided by *TKMesh* toolkit:
+
+~~~~~
+const char* BRepMesh_Dump (void* theMeshHandlePtr, const char* theFileNameStr)
+~~~~~
+
+Stores mesh produced in parametric space to BREP file.
+- *theMeshHandlePtr* - a pointer to *Handle(BRepMesh_DataStructureOfDelaun)* variable.
+- *theFileNameStr* - the name of the file where the mesh is stored.
 
 The following additional function is provided by *TKGeomBase* toolkit:
 
@@ -87,7 +113,7 @@ const char* GeomTools_Dump (void* theHandlePtr)
 ~~~~~
 
 Dump geometric object to cout.
-- *theHandlePtr* – a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
+- *theHandlePtr* - a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
 
 @section occt_debug_vstudio Using Visual Studio debugger 
 
@@ -114,11 +140,13 @@ For convenience it is possible to define aliases to commands in this window, for
 ~~~~~
 >alias deval      ? ({,,TKDraw}Draw_Eval)
 >alias dsetshape  ? ({,,TKDraw}DBRep_Set)
->alias dsetgeom   ? ({,,TKDraw}DrawTrSurf_SetPnt)
+>alias dsetgeom   ? ({,,TKDraw}DrawTrSurf_Set)
+>alias dsetpnt    ? ({,,TKDraw}DrawTrSurf_SetPnt)
 >alias dsetpnt2d  ? ({,,TKDraw}DrawTrSurf_SetPnt2d)
 >alias saveshape  ? ({,,TKBRep}BRepTools_Write)
 >alias dumpshape  ? ({,,TKBRep}BRepTools_Dump)
 >alias dumploc    ? ({,,TKBRep}BRepTools_DumpLoc)
+>alias dumpmesh   ? ({,,TKMesh}BRepMesh_Dump)
 >alias dumpgeom   ? ({,,TKGeomBase}GeomTools_Dump)
 ~~~~~ 
 
@@ -241,4 +269,22 @@ Handle_TCollection_HAsciiString {
 }
 ~~~~~
 
-In Visual Studio 2012 and later, visualizers can be put in a separate file in subdirectory *Visualizers*. See file *occt.natvis* for example.
+In Visual Studio 2012 and later, visualizers can be put in a separate file in subdirectory *Visualizers*. See file *occt.natvis* for example.
+
+@section occt_debug_perf Performance measurement tools
+
+It is recommended to use specialized performance analysis tools to profile OCCT and application code.
+However, when such tools are not available or cannot be used for some reason, tools provided by OSD package can be used: low-level C functions and macros defined in *OSD_PerfMeter.h* and *OSD_PerfMeter* class.
+
+This tool maintains an array of 100 global performance counters that can be started and stopped independently. Adding a performance counter to a function of interest allows to get statistics on the number of calls and the total execution time of the function.
+* In C++ code, this can be achieved by creating local variable *OSD_PerfMeter* in each block of code to be measured.
+* In C or Fortran code, use functions *perf_start_meter* and *perf_stop_meter* to start and stop the counter.
+
+Note that this instrumentation is intended to be removed when the profiling is completed.
+
+Macros provided in *OSD_PerfMeter.h* can be used to keep instrumentation code permanently but enable it only when macro *PERF_ENABLE_METERS* is defined.
+Each counter has its name shown when the collected statistics are printed.
+
+In DRAW, use command *dperf* to print all performance statistics.
+
+Note that performance counters are not thread-safe.

dox/dev_guides/dev_guides.md

@@ -11,8 +11,12 @@ The following documents provide information on OCCT building, development and te
 * @subpage occt_dev_guides__tests "Automatic Testing system"
 * @subpage occt_dev_guides__debug "Debugging tools and hints"
 
-Two other documents provide details on obsolete technologies used by OCCT, 
+These two documents provide details on obsolete technologies used by OCCT, 
 to be removed in future releases:
 
 * @subpage occt_dev_guides__wok "Workshop Organization Kit (WOK)"
 * @subpage occt_dev_guides__cdl "Component Definition Language (CDL)"
+
+The following guide provides information relevant to upgrading applications developed with previous versions of OCCT, to recent one:
+
+* @subpage occt_dev_guides__upgrade "Upgrade from previous OCCT versions"

dox/dev_guides/git_guide/git_guide.md

@@ -396,7 +396,7 @@ In TortoiseGit:
 @image latex OCCT_GitGuide_V2_image014.png
 
   Unstaged files will be shown if you check the option ‘Show Unversioned Files’. 
-  Double-clock on each modified file to see the changes to be committed (as a difference vs. the base version). 
+  Double-click on each modified file to see the changes to be committed (as a difference vs. the base version). 
 
 @subsection occt_gitguide_4_6 Pushing branch to the remote repository
 

dox/dev_guides/tests/tests.md

@@ -23,7 +23,7 @@ The tests are organized in three levels:
   
 See <a href="#testmanual_5_1">Test Groups</a> for the current list of available test groups and grids.
 
-Some tests involve data files (typically CAD models) which are located separately and are not included with OCCT code. The archive with publicly available test data files should be downloaded and installed independently on OCCT sources (from http://dev.opencascade.org).
+Some tests involve data files (typically CAD models) which are located separately and are not included with OCCT code. The archive with publicly available test data files should be downloaded and installed independently on OCCT sources (see http://dev.opencascade.org).
 
 @subsection testmanual_1_2 Intended Use of Automatic Tests
 
@@ -44,7 +44,6 @@ The modifications made in the OCCT code and related test scripts should be inclu
 @subsubsection testmanual_1_3_1 Setup
 
 Before running tests, make sure to define environment variable *CSF_TestDataPath* pointing to the directory containing test data files. 
-(Publicly available data files can be downloaded from http://dev.opencascade.org separately from OCCT code.) 
 
 For this it is recommended to add a file *DrawAppliInit* in the directory which is current at the moment of starting DRAWEXE (normally it is OCCT root directory, <i>$CASROOT </i>). This file is evaluated automatically at the DRAW start. 
 
@@ -56,9 +55,9 @@ return ;# this is to avoid an echo of the last command above in cout
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Note that variable *CSF_TestDataPath* is set to default value at DRAW start, pointing at the folder <i>$CASROOT/data</i>. 
-In this example, subdirectory <i>d:/occt/test-data</i> is added to this path. Similar code could be used on Linux and Mac OS X except that on non-Windows platforms colon ‘:’ should be used as path separator instead of semicolon ‘;’.
+In this example, subdirectory <i>d:/occt/test-data</i> is added to this path. Similar code could be used on Linux and Mac OS X except that on non-Windows platforms colon ":" should be used as path separator instead of semicolon ";".
 
-All tests are run from DRAW command prompt (run *draw.tcl* or *draw.sh* to start it).
+All tests are run from DRAW command prompt (run *draw.bat* or *draw.sh* to start it).
 
 @subsubsection testmanual_1_3_2 Running Tests
 
@@ -70,15 +69,15 @@ Example:
 Draw[]> testgrid
 ~~~~~
 
-For running only a group or a grid of tests, give additional arguments indicating followed by path to the group and (if needed) the grid name.
+To run only a subset of test cases, give masks for group, grid, and test case names to be executed.
+Each argument is a list of file masks separated with commas or spaces; by default "*" is assumed.
 
 Example:
 
 ~~~~~
-Draw[]> testgrid blend simple
+Draw[]> testgrid bugs caf,moddata*,xde
 ~~~~~
 
-
 As the tests progress, the result of each test case is reported. 
 At the end of the log a summary of test cases is output, 
 including the list of detected regressions and improvements, if any. 
@@ -101,34 +100,35 @@ Example:
 
 The tests are considered as non-regressive if only OK, BAD (i.e. known problem), and SKIPPED (i.e. not executed, typically because of lack of a data file) statuses are reported. See <a href="#testmanual_3_5">Interpretation of test results</a> for details.
 
-The results and detailed logs of the tests are saved by default to a subdirectory of the current folder, whose name is generated automatically using the current date and time, prefixed by word <i>"results_"</i> and Git branch name (if Git is available and current sources are managed by Git).
-If necessary, a non-default output directory can be specified using option <i> –outdir</i> followed by a path to the directory. This directory should be new or empty; use option –overwrite to allow writing results in existing non-empty directory. 
+The results and detailed logs of the tests are saved by default to a new subdirectory of the subdirectory *results* in the current folder, whose name is generated automatically using the current date and time, prefixed by Git branch name (if Git is available and current sources are managed by Git).
+If necessary, a non-default output directory can be specified using option <i> –outdir</i> followed by a path to the directory. This directory should be new or empty; use option <i>–overwrite</i> to allow writing results in the existing non-empty directory. 
 
 Example:
 ~~~~~
-Draw[]> testgrid –outdir d:/occt/last_results -overwrite
+Draw[]> testgrid -outdir d:/occt/last_results -overwrite
 ~~~~~
-In the output directory, a cumulative HTML report summary.html provides links to reports on each test case. An additional report in JUnit-style XML format can be output for use in Jenkins or other continuous integration system.
+In the output directory, a cumulative HTML report <i>summary.html</i> provides links to reports on each test case. An additional report in JUnit-style XML format can be output for use in Jenkins or other continuous integration system.
 
-Type <i>help testgrid</i> in DRAW prompt to get help on options supported by *testgrid* command.
-
-For example: 
+Type <i>help testgrid</i> in DRAW prompt to get help on options supported by *testgrid* command:
 
 ~~~~~
 Draw[3]> help testgrid
 testgrid: Run all tests, or specified group, or one grid
-    Use: testgrid [group [grid]] [options...]
+    Use: testgrid [groupmask [gridmask [casemask]]] [options...]
     Allowed options are:
     -parallel N: run N parallel processes (default is number of CPUs, 0 to disable)
     -refresh N: save summary logs every N seconds (default 60, minimal 1, 0 to disable)
     -outdir dirname: set log directory (should be empty or non-existing)
     -overwrite: force writing logs in existing non-empty directory
     -xml filename: write XML report for Jenkins (in JUnit-like format)
+    -beep: play sound signal at the end of the tests
+    Groups, grids, and test cases to be executed can be specified by list of file 
+    masks, separated by spaces or comma; default is all (*).
 ~~~~~
 
 @subsubsection testmanual_1_3_3 Running a Single Test
 
-To run a single test, type command *test*’ followed by names of group, grid, and test case. 
+To run a single test, type command *test* followed by names of group, grid, and test case. 
 
 Example:
 
@@ -143,26 +143,49 @@ Note that normally an intermediate output of the script is not shown. The detail
 To see intermediate commands and their output during the test execution, add one more argument 
 <i>"echo"</i> at the end of the command line. Note that with this option the log is not collected and summary is not produced.
 
+Type <i>help test</i> in DRAW prompt to get help on options supported by *test* command:
+
+~~~~~
+Draw[3]> help test
+test: Run specified test case
+ Use: test group grid casename [options...]
+ Allowed options are:
+ -echo: all commands and results are echoed immediately,
+        but log is not saved and summary is not produced
+        It is also possible to use "1" instead of "-echo"
+        If echo is OFF, log is stored in memory and only summary
+        is output (the log can be obtained with command "dlog get")
+ -outfile filename: set log file (should be non-existing),
+        it is possible to save log file in text file or
+        in html file(with snapshot), for that "filename"
+        should have ".html" extension
+ -overwrite: force writing log in existing file
+ -beep: play sound signal at the end of the test
+ -errors: show all lines from the log report that are recognized as errors
+        This key will be ignored if the "-echo" key is already set.
+~~~~~
+
 @subsubsection testmanual_1_3_4 Creating a New Test
 
 The detailed rules of creation of new tests are given in <a href="#testmanual_3">section 3</a>. The following short description covers the most typical situations:
 
-Use prefix “bug” followed by Mantis issue ID and, if necessary, additional suffixes, for naming the test script and DRAW commands specific for this test case.
+Use prefix <i>bug</i> followed by Mantis issue ID and, if necessary, additional suffixes, for naming the test script and DRAW commands specific for this test case.
 
 1.	If the test requires C++ code, add it as new DRAW command(s) in one of files in *QABugs* package. Note that this package defines macros *QVERIFY* and *QCOMPARE*, thus code created for QTest or GoogleTest frameworks can be used with minimal modifications.
-2.	Add script(s) for the test case in grid (subfolder) corresponding to the relevant OCCT module of the group bugs <i>($CASROOT/tests/bugs)</i>. See <a href="#testmanual_5_2">the correspondence map</a>.
+2.	Add script(s) for the test case in the subfolder corresponding to the relevant OCCT module of the group bugs <i>($CASROOT/tests/bugs)</i>. See <a href="#testmanual_5_2">the correspondence map</a>.
 3.	In the test script:
 	*	Load all necessary DRAW modules by command *pload*.
 	*	Use command *locate_data_file* to get a path to data files used by test script. (Make sure to have this command not inside catch statement if it is used.)
 	*	Use DRAW commands to reproduce the situation being tested.
 	*	If test case is added to describe existing problem and the fix is not available, add TODO message for each error to mark it as known problem. The TODO statements must be specific so as to match the actually generated messages but not all similar errors.
-	*	Make sure that in case of failure the test produces message containing word “Error” or other recognized by test system as error (see files parse.rules).
+	*	Make sure that in case of failure the test produces message containing word "Error" or other recognized by test system as error (see files parse.rules).
 4.	If the test case uses data file(s) not yet present in the test database, these can be put to subfolder data of the test grid, and integrated to Git along with the test case.
 5.	Check that the test case runs as expected (test for fix: OK with the fix, FAILED without the fix; test for existing problem: BAD), and integrate to Git branch created for the issue.
 
 Example:
 
 * Added files:
+
 ~~~~~
 git status –short
 A tests/bugs/heal/data/OCC210a.brep
@@ -189,7 +212,7 @@ checkshape result
 Standard OCCT tests are located in subdirectory tests of the OCCT root folder ($CASROOT).
 
 Additional test folders can be added to the test system by defining environment variable *CSF_TestScriptsPath*. This should be list of paths separated by semicolons (*;*) on Windows 
-or colons (*:*) on Linux or Mac. Upon DRAW launch, path to tests sub-folder of OCCT is added at the end of this variable automatically. 
+or colons (*:*) on Linux or Mac. Upon DRAW launch, path to tests subfolder of OCCT is added at the end of this variable automatically. 
 
 Each test folder is expected to contain:
   * Optional file parse.rules defining patterns for interpretation of test results, common for all groups in this folder
@@ -281,7 +304,7 @@ The test group may contain *parse.rules* file. This file defines patterns used f
 
 Each line in the file should specify a status (single word), followed by a regular expression delimited by slashes (*/*) that will be matched against lines in the test output log to check if it corresponds to this status.
 
-The regular expressions support a subset of the Perl *re* syntax. See also <a href=http://perldoc.perl.org/perlre.html>Perl regular expressions</a>.
+The regular expressions support a subset of the Perl *re* syntax. See also <a href="http://perldoc.perl.org/perlre.html">Perl regular expressions</a>.
 
 The rest of the line can contain a comment message, which will be added to the test report when this status is detected.
 
@@ -350,7 +373,7 @@ Usually it executes a specific sequence of commands common for all tests in the
 Example:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.tcl}
-    vdump $logdir/${casename}.gif ;# makes a snap-shot of AIS viewer
+    vdump $imagedir/${casename}.png ;# makes a snap-shot of AIS viewer
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 @subsubsection testmanual_2_3_4 File "cases.list"
@@ -432,13 +455,15 @@ If the new test corresponds to a functionality already covered by the existing s
 
 @subsection testmanual_3_2 Adding Data Files Required for a Test
 
-It is advisable to make self-contained test scripts whenever possible, so as they could be used in environments where data files are not available. For that simple geometric objects and shapes can be created using DRAW commands in the test script itself.
+It is advisable to make self-contained test scripts whenever possible, so as they could be used in the  environments where data files are not available. For that simple geometric objects and shapes can be created using DRAW commands in the test script itself.
 
-If the test requires a data file, it should be put to subdirectory *data* of the test grid. It is recommended to prefix the data file with the corresponding issue id prefixed by *bug*, e.g. *bug12345_face1.brep*, to avoid possible conflicts with names of existing data files. 
+If the test requires a data file, it should be put to the directory listed in environment variable *CSF_TestDataPath*.
+Alternatively, it can be put to subdirectory *data* of the test grid. 
+It is recommended to prefix the data file with the corresponding issue id prefixed by *bug*, e.g. *bug12345_face1.brep*, to avoid possible conflicts with names of existing data files. 
 
-Note that when the test is integrated to the master branch, OCC team will move the data file to data files repository, so as to keep OCCT sources repository clean from data files.
+Note that when the test is integrated to the master branch, OCC team will move the data file to the data files repository, to keep OCCT sources repository clean from data files.
 
-When preparing a test script, try to minimize the size of involved data model. For instance, if the problem detected on a big shape can be reproduced on a single face extracted from that shape, use only that face in the test.
+When you prepare a test script, try to minimize the size of involved data model. For instance, if the problem detected on a big shape can be reproduced on a single face extracted from that shape, use only that face in the test.
 
 
 @subsection testmanual_3_3 Adding new DRAW commands
@@ -449,7 +474,7 @@ If the test cannot be implemented using available DRAW commands, consider the fo
 * Otherwise the new command implementing the actions needed for this particular test should be added in *QABugs* package. The command name should be formed by the Mantis issue ID prefixed by *bug*, e.g. *bug12345*.
 
 Note that a DRAW command is expected to return 0 in case of a normal completion, and 1 (Tcl exception) if it is incorrectly used (e.g. a wrong number of input arguments). Thus if the new command needs to report a test error, this should be done by outputting an appropriate error message rather than by returning a non-zero value.
-
+File names must be encoded in the script rather than in the DRAW command and passed to the DRAW command as an argument.
 
 @subsection testmanual_3_4 Script Implementation
 
@@ -495,15 +520,26 @@ Example:
 stepread [locate_data_file CAROSKI_COUPELLE.step] a *
 ~~~~~
 
-When the test needs to produce some snapshots or other artefacts, use Tcl variable *logdir* as the location where such files should be put. Command *testgrid* sets this variable to the subdirectory of the results folder corresponding to the grid. Command *test* sets it to <i>$CASROOT/tmp</i> unless it is already defined. Use Tcl variable *casename* to prefix all files produced by the test. This variable is set to the name of the test case.
+When the test needs to produce some snapshots or other artefacts, use Tcl variable *imagedir* as the location where such files should be put. 
+* Command *testgrid* sets this variable to the subdirectory of the results folder corresponding to the grid. 
+* Command *test* by default creates a dedicated temporary directory in the system temporary folder (normally the one specified by environment variable *TempDir*, *TEMP*, or *TMP*) for each execution, and sets *imagedir* to that location. 
+
+However if variable *imagedir* is defined on the top level of Tcl interpretor, command *test* will use it instead of creating a new directory.
+
+Use Tcl variable *casename* to prefix all files produced by the test. 
+This variable is set to the name of the test case.
+
+The test system can recognize an image file (snapshot) and include it in HTML log and differences if its name starts with the name of the test case (use variable *casename*), optionally followed by underscore or dash and arbitrary suffix.
+
+The image format (defined by extension) should be *png*.
 
 Example:
 ~~~~~
-xwd $logdir/${casename}.png
+xwd $imagedir/${casename}.png
 vdisplay result; vfit
-vdump $logdir/${casename}-axo.png
+vdump $imagedir/${casename}-axo.png
 vfront; vfit
-vdump $logdir/${casename}-front.png
+vdump $imagedir/${casename}-front.png
 ~~~~~
 
 would produce:
@@ -515,11 +551,15 @@ A1-front.png
 
 Note that OCCT must be built with FreeImage support to be able to produce usable images.
 
+Other Tcl variables defined during the test execution are:
+- *groupname*: name of the test group;
+- *gridname*: name of the test grid;
+- *dirname*: path to the root directory of the current set of test scripts.
+
 In order to ensure that the test works as expected in different environments, observe the following additional rules:
 * Avoid using external commands such as *grep, rm,* etc., as these commands can be absent on another system (e.g. on Windows); use facilities provided by Tcl instead.
 * Do not put call to *locate_data_file* in catch statement – this can prevent correct interpretation of the missing data file by the test system.
 
-
 @subsection testmanual_3_5 Interpretation of test results
 
 The result of the test is evaluated by checking its output against patterns defined in the files *parse.rules* of the grid and group.
@@ -538,7 +578,7 @@ The new test created for an unsolved problem should return BAD. The new test cre
 
 @subsection testmanual_3_6 Marking BAD cases
 
-If the test produces an invalid result at a certain moment then corresponding bug should be created in the  OCCT issue tracker located at http://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.
+If the test produces an invalid result at a certain moment then the corresponding bug should be created in the OCCT issue tracker located at http://tracker.dev.opencascade.org, and the problem should be marked as TODO in the test script.
 
 The following statement should be added to such a test script:
 ~~~~~
@@ -547,7 +587,7 @@ puts "TODO BugNumber ListOfPlatforms: RegularExpression"
 
 Here:
 * *BugNumber* is the bug ID in the tracker. For example: #12345.
-* *ListOfPlatforms* is a list of platforms at which the bug is reproduced (e.g. Mandriva2008, Windows or All). Note that the platform name is custom for the OCCT test system; it corresponds to the value of environment variable *os_type* defined in DRAW.
+* *ListOfPlatforms* is a list of platforms, at which the bug is reproduced (e.g. Mandriva2008, Windows or All). Note that the platform name is custom for the OCCT test system; it corresponds to the value of environment variable *os_type* defined in DRAW.
 
 Example:
 ~~~~~
@@ -555,7 +595,7 @@ Draw[2]> puts $env(os_type)
 windows
 ~~~~~
 
-* RegularExpression is a regular expression which should be matched against the line indicating the problem in the script output. 
+* RegularExpression is a regular expression, which should be matched against the line indicating the problem in the script output. 
 
 Example:
 ~~~~~
@@ -582,7 +622,7 @@ puts "TODO OCC22817 All: TEST INCOMPLETE"
 
 @subsection testmanual_4_1 Running Tests on Older Versions of OCCT
 
-Sometimes it might be necessary to run tests on previous versions of OCCT (<= 6.5.4) that do not include this test system. This can be done by adding DRAW configuration file *DrawAppliInit* in the directory which is current by the moment of DRAW start-up, to load test commands and to define necessary environment.
+Sometimes it might be necessary to run tests on the previous versions of OCCT (<= 6.5.4) that do not include this test system. This can be done by adding DRAW configuration file *DrawAppliInit* in the directory, which is current by the moment of DRAW start-up, to load test commands and to define the necessary environment.
 
 Note: in OCCT 6.5.3, file *DrawAppliInit* already exists in <i>$CASROOT/src/DrawResources</i>, new commands should be added to this file instead of a new one in the current directory.
 
@@ -596,7 +636,7 @@ set env(CSF_TestDataPath) $env(CASROOT)/data;d:/test-data
 return
 ~~~~~
 
-Note that on older versions of OCCT the tests are run in compatibility mode and not all output of the test command can be captured; this can lead to absence of some error messages (can be reported as either a failure or an improvement).
+Note that on older versions of OCCT the tests are run in compatibility mode and thus not all output of the test command can be captured; this can lead to absence of some error messages (can be reported as either a failure or an improvement).
 
 @subsection testmanual_4_2 Adding custom tests
 
@@ -617,7 +657,8 @@ return ;# this is to avoid an echo of the last command above in cout
 
 For better efficiency, on computers with multiple CPUs the tests can be run in parallel mode. This is default behavior for command *testgrid* : the tests are executed in parallel processes (their number is equal to the number of CPUs available on the system). In order to change this behavior, use option  parallel followed by the number of processes to be used (1 or 0 to run sequentially).
 
-Note that the parallel execution is only possible if Tcl extension package *Thread* is installed. It is included in *ActiveTcl* package, but can be absent in some Linux distributions. If this package is not available, *testgrid* command will output a warning message.
+Note that the parallel execution is only possible if Tcl extension package *Thread* is installed. 
+If this package is not available, *testgrid* command will output a warning message.
 
 @subsection testmanual_4_4 Checking non-regression of performance, memory, and visualization
 
@@ -943,13 +984,13 @@ This group allows  testing extended data exchange packages.
 | Data Exchange	|	TKSTEPBase, TKSTEPAttr, TKSTEP209, TKSTEP |	step |
 | Data Exchange	|	TKSTL, TKVRML 	| stlvrml |
 | Data Exchange	| TKXSBase, TKXCAF, TKXCAFSchema, TKXDEIGES, TKXDESTEP, TKXmlXCAF, TKBinXCAF | xde |
-| Foundation Classes |	TKernel, TKMath, TKAdvTools	| fclasses |
+| Foundation Classes |	TKernel, TKMath	| fclasses |
 | Modeling_algorithms |	TKGeomAlgo, TKTopAlgo, TKPrim, TKBO, TKBool, TKHLR, TKFillet, TKOffset, TKFeat, TKXMesh |	modalg |
 | Modeling Data | TKG2d, TKG3d, TKGeomBase, TKBRep	| moddata |
 | Visualization | TKService, TKV2d, TKV3d, TKOpenGl, TKMeshVS, TKNIS, TKVoxel	| vis |
 
 
-@subsection testmanual_5_2 Recommended approaches to checking test results
+@subsection testmanual_5_3 Recommended approaches to checking test results
 
 @subsubsection testmanual_5_3_1 Shape validity
 
@@ -960,6 +1001,36 @@ Example
 checkshape result
 ~~~~~
 
+To check the number of faults in the shape command *checkfaults* can be used.
+
+Use: checkfaults shape source_shape [ref_value=0]
+
+The default syntax of *checkfaults* command:
+~~~~~
+checkfaults results a_1
+~~~~~
+
+The command will check the number of faults in the source shape (*a_1*) and compare it
+with number of faults in the resulting shape (*result*). If shape *result* contains
+more faults, you will get an error:
+~~~~~
+checkfaults results a_1
+Error : Number of faults is 5
+~~~~~
+It is possible to set the reference value for comparison (reference value is 4):
+
+~~~~~
+checkfaults results a_1 4
+~~~~~
+
+If number of faults in the resulting shape is unstable, reference value should be set to "-1".
+As a result command *checkfaults* will return the following error:
+
+~~~~~
+checkfaults results a_1 -1
+Error : Number of faults is UNSTABLE
+~~~~~
+
 @subsubsection testmanual_5_3_2 Shape tolerance
 The maximal tolerance of sub-shapes of each kind of the resulting shape can be extracted from output of tolerance command as follows:
 
@@ -970,6 +1041,33 @@ regexp { *EDGE +: +MAX=([-0-9.+eE]+)} $tolerance dummy max_edgee
 regexp { *VERTEX +: +MAX=([-0-9.+eE]+)} $tolerance dummy max_vertex
 ~~~~~
 
+It is possible to use command *checkmaxtol* to check maximal tolerance of shape and compare it with reference value.
+
+Use: checkmaxtol shape ref_value [source_shapes={}] [options...]
+
+Allowed options are:
+ *   -min_tol: minimum tolerance for comparison
+ *   -multi_tol: tolerance multiplier
+
+Argument "source_shapes" is a list of shapes to compare with.
+It can be empty to skip comparison of tolerance with these shapes.
+
+The default syntax of *checkmaxtol* command for comparison with the reference value:
+~~~~~
+checkmaxtol result 0.00001
+~~~~~
+
+There is an opportunity to compare max tolerance of resulting shape with max tolerance of source shape.
+In the following example command *checkmaxtol* gets max tolerance among objects *a_1* and *a_2*.
+Then it chooses the maximum value between founded tolerance and value -min_tol (0.000001)
+and multiply it on the coefficient -multi_tol (i.e. 2):
+
+~~~~~
+checkmaxtol result 0.00001 {a_1 a_2} -min_tol 0.000001 -multi_tol 2
+~~~~~
+
+If the value of maximum tolerance more than founded tolerance for comparison, the command will return an error.
+
 @subsubsection testmanual_5_3_3 Shape volume, area, or length
 
 Use command *vprops, sprops,* or *lprops* to correspondingly measure volume, area, or length of the shape produced by the test. The value can be extracted from the result of the command by *regexp*.
@@ -1006,7 +1104,7 @@ for {set i 1} {$i < 100} {incr i} {
 
 @subsubsection testmanual_5_3_5 Visualization
 
-Take a snapshot of the viewer, give it the name of the test case, and save in the directory indicated by Tcl variable *imagedir*. Note that this variable directs to the *log* directory if command *testgrid* is active, or to *tmp* subdirectory of the current folder if the test is run interactively.
+Take a snapshot of the viewer, give it the name of the test case, and save in the directory indicated by Tcl variable *imagedir*. 
 
 ~~~~~
 vinit
@@ -1019,3 +1117,82 @@ vdump $imagedir/${casename}_shading.png
 ~~~~~
 
 This image will be included in the HTML log produced by *testgrid* command and will be checked for non-regression through comparison of images by command *testdiff*.
+
+@subsubsection testmanual_5_3_6 Number of free edges
+
+To check the number of free edges run the command *checkfreebounds*.
+
+It compares number of free edges with reference value.
+
+Use: checkfreebounds shape ref_value [options...]
+
+Allowed options are:
+ * -tol N: used tolerance (default -0.01)
+ * -type N: used type, possible values are "closed" and "opened" (default "closed")
+
+~~~~~
+checkfreebounds result 13
+~~~~~
+
+Option -tol N is used to set tolerance for command *freebounds*, which is used within command *checkfreebounds*.
+
+Option -type N is used to select the type of counted free edges - closed or opened.
+
+If the number of free edges in the resulting shape is unstable, reference value should be set to "-1".
+As a result command *checkfreebounds* will return the following error:
+
+~~~~~
+checkfreebounds result -1
+Error : Number of free edges is UNSTABLE
+~~~~~
+
+@subsubsection testmanual_5_3_7 Compare numbers
+
+Procedure to check equality of two reals with some tolerance (relative and absolute)
+
+Use: checkreal name value expected tol_abs tol_rel
+
+~~~~~
+checkreal "Some important value" $value 5 0.0001 0.01
+~~~~~
+
+@subsubsection testmanual_5_3_8 Check number of sub-shapes
+
+Compare number of sub-shapes in "shape" with given reference data
+
+Use: checknbshapes shape [options...]
+Allowed options are:
+ * -vertex N
+ * -edge N
+ * -wire N
+ * -face N
+ * -shell N
+ * -solid N
+ * -compsolid N
+ * -compound N
+ * -shape N
+ * -t: compare the number of sub-shapes in "shape" counting
+      the same sub-shapes with different location as different sub-shapes.
+ * -m msg: print "msg" in case of error
+
+~~~~~
+checknbshapes result -vertex 8 -edge 4
+~~~~~
+
+@subsubsection testmanual_5_3_9 Check pixel color
+
+To check pixel color command *checkcolor* can be used.
+
+Use: checkcolor x y red green blue
+
+  x y - pixel coordinates
+
+  red green blue - expected pixel color (values from 0 to 1)
+
+This procedure checks color with tolerance (5x5 area)
+
+Next example will compare color of point with coordinates x=100 y=100 with RGB color R=1 G=0 B=0.
+If colors are not equal, procedure will check the nearest ones points (5x5 area)
+~~~~~
+checkcolor 100 100 1 0 0
+~~~~~

dox/dev_guides/upgrade/upgrade.md

@@ -0,0 +1,57 @@
+Upgrade from older OCCT versions  {#occt_dev_guides__upgrade}
+================================
+
+@tableofcontents
+
+@section occt_upgrade_intro Introduction
+
+This document provides technical details on upgrading user applications using previous versions of OCCT, to the current one.
+
+@subsection occt_upgrade_700 Upgrade to OCCT 7.0.0
+
+@subsubsection occt_upgrade_700_persist Removal of legacy persistence
+
+Legacy persistence for shapes and OCAF data based on Storage_Schema (toolkits TKShapeShcema, TLStdLSchema, TKStdSchema, TKXCAFSchema) has been removed in OCCT 7.0.0.
+Applications that used these persistence tools for their data need to be updated to use other persistence mechanisms.
+
+The existing data files in standard formats can be converted using OCCT 6.9.0 or previous, as follows.
+
+#### CSFDB files
+
+Files in CSFDB format (usually with extension .csfdb) contain OCCT shape data that can be converted to BRep format. 
+The easiest way to do that is to use ImportExport sample provided with OCCT 6.9.0 (or earlier):
+
+- Start ImportExport sample
+- Select File / New
+- Select File / Import / CSFDB... and specify the file to be converted
+- Drag mouse with right button pressed across the view to select all shapes by rectangle
+- Select File / Export / BREP... and specify location and name for the resulting file
+
+#### OCAF and XCAF documents
+
+Files containing OCAF data saved in old format usually have extensions .std or .sgd or .dxc (XDE documents).
+These files can be converted to XML or binary OCAF formats using DRAW Test Harness commands available in OCCT 6.9.0 or earlier.
+
+For that, start *DRAWEXE* and perform the following commands: 
+
+  * for the conversion of the "*.std" and "*.sgd" file formats to the binary format "*.cbf" (Created document should be in **BinOcaf** format instead of **MDTV-Standard**):
+
+  @code
+  Draw[]> pload ALL
+  Draw[]> Open [path to *.std or *.sgd file] Doc
+  Draw[]> Format Doc BinOcaf
+  Draw[]> SaveAs Doc [path to the new file]
+  @endcode
+
+  * for the conversion of the "*.dxc" file format to the binary format "*.xbf" (Created document should be in **BinXCAF** format instead of **MDTV-XCAF**):
+
+  @code
+  Draw[]> pload ALL
+  Draw[]> XOpen [path to *.dxc file] Doc
+  Draw[]> Format Doc BinXCAF
+  Draw[]> XSave Doc [path to the new file]
+  @endcode
+
+On Windows, be careful to replace back slashes in the file path by either direct slash or pairs of back slashes.
+Use "XmlOcaf" or "XmlXCAF" instead of "BinOcaf" and "BinXCAF", respectively, to save in XML format instead of binary one.
+

dox/dev_guides/wok/wok.md

@@ -480,8 +480,11 @@ This automatically takes you to the root directory of the workbench
 
 @subsubsection occt_wok_3_3_8  Using Existing Resources
 Before creating new data types, you should look for existing components that you can reuse. In particular, you should look through the existing resources of your Open CASCADE Technology platform to see if any of the required components already exist, or if any existing generic components can be suitably implemented. This search can be conducted using the online documentation. You should note the packages and classes, which you can reuse. 
+
 @subsection occt_wok_3_4  Creating Software Components
+
 @subsubsection occt_wok_3_4_1  Creating a Package
+
 To develop new software components, you usually need to create one or more packages. You do this, by using the following command: 
 ~~~~~
 > ucreate –p <MyPackage> 
@@ -613,6 +616,7 @@ The umake steps for development units of package type are explained below.
 * *obj.lib*     Generates the shared library for the development unit. 
 
 @subsubsection occt_wok_3_4_2  Creating a Nocdlpack
+
 If your executable requires the use of a nocdlpack, create a development unit of nocdlpack type and move to its structure using the commands below: 
 ~~~~~
   > ucreate -n <MyNoCDLPack>
@@ -656,7 +660,8 @@ The *umake* steps for development units of *nocdlpack* type are explained below.
   + Implementation dependencies in terms of the unit suppliers. (Unit.ImplDep) 
 * *obj.lib*   Generates the shared library for the unit. 
 
-@subsubsection occt_wok_3_3_3  Creating a Schema
+@subsubsection occt_wok_3_4_3  Creating a Schema
+
 If the application, which you intend to build, stores data in a file, you need to define a schema for the persistent data types that are known. 
 
 You create a schema and go to its root directory using the commands: 
@@ -735,7 +740,9 @@ The umake steps for development units of schema type are explained below.
 * *obj.idep*   Generates dependency information for the schema. 
 
 @subsection occt_wok_3_5  Building an Executable
+
 @subsubsection occt_wok_3_5_1  Creating an Executable
+
 To make an executable from one or more of the packages, which you have created, write a .cdl file to specify the packages to use. 
 
 #### Writing an Executable
@@ -805,7 +812,9 @@ The umake steps for development units of executable type are explained below.
 * *exec.link* Links each part of the executable. 
 
 @subsection occt_wok_3_6  Test Environments
-@subsubsection occt_wok_3_3_1  Testing an Executable
+
+@subsubsection occt_wok_3_6_1  Testing an Executable
+
 To test an executable, you create an executable development unit and move to its structure.
 
 When you write the .cdl file for your test executable, specify the packages to test, for example: 
@@ -2982,8 +2991,7 @@ As a simple textual language, tcl is intended primarily for issuing commands to
 
 As a library package, tcl can be embedded in application programs. The tcl library consists of a parser for the cl language, routines to implement the tcl builtin commands, and procedures that allow each application to extend tcl with additional commands specific to that application. The application program generates tcl commands and passes them to the tcl parser for execution. Commands may be generated by reading characters from an input source, or by associating command strings with elements of the application's user interface, such as menu entries, buttons, or keystrokes.
 
-For Linux platform it is possible to download Tcltk 8.5 or 8.6 from http://www.tcl.tk/software/tcltk/8.6.html
-For Windows platforn it is possible to download ActiveTcl 8.5 or 8.6 from http://www.activestate.com/activetcl/downloads
+Download Tcltk 8.5 or 8.6 from http://www.tcl.tk/software/tcltk/8.6.html
 
 A help application, tclhelp, is also provided with tcl and can be activated by command *tclhelp*.  
 

dox/overview/Overview.md

@@ -1,616 +0,0 @@
-Overview {#mainpage}
-========
-
-@tableofcontents
-
-@section OCCT_OVW_SECTION_1 Welcome
-
-Welcome to Open CASCADE Technology (OCCT), a software development platform 
-providing services for 3D surface and solid modeling, CAD data exchange, and 
-visualization. Most of OCCT functionality is available in the form of C++ 
-libraries. OCCT can be best applied in development of software dealing with 3D 
-modeling (CAD), manufacturing / measuring (CAM) or numerical simulation (CAE).
-
-@htmlonly<center>@endhtmlonly 
-http://www.opencascade.org
-@image html /resources/occt_logo.png
-@image latex /resources/occt_logo.png
-@htmlonly</center>@endhtmlonly
-
-@section OCCT_OVW_SECTION_2 Copyrights
-
-Open CASCADE Technology and all materials, including this documentation, is 
-Copyright (c) 1999-2013 by OPEN CASCADE S.A.S. All rights reserved.
-
-@htmlonly<center>@endhtmlonly
-http://www.opencascade.com
-@image html /resources/occ_logo.png
-@image latex /resources/occ_logo.png
-@htmlonly</center>@endhtmlonly
-
- License
---------
-
-Open CASCADE Technology is free software; you can redistribute it and / or 
-modify it under the terms of the 
-@ref license_lgpl_21 "GNU Lesser General Public License (LGPL) version 2.1", 
-with additional @ref occt_lgpl_exception "exception".
-
-Alternatively, Open CASCADE Technology may be used under the terms of Open 
-CASCADE commercial license or contractual agreement.
-
-Note that Open CASCADE Technology is provided on an "AS IS" basis, WITHOUT 
-WARRANTY OF ANY KIND. The entire risk related to any use of the OCCT code and 
-materials is on you. See the @ref occt_public_license "license" text for formal 
-disclaimer.
-
- Trademark information
-----------------------
-
-You are hereby informed that all software is a property of its respective authors and is protected by 
-international and domestic laws on intellectual property and trademarks. 
-Should you need further information, please directly contact the authors.
-
-**CAS.CADE** and **Open CASCADE** are registered trademarks of 
-OPEN CASCADE S.A.S.
-
-**Linux** is a registered trademark of Linus Torvalds.
-
-**Windows** is a registered trademark of Microsoft Corporation in the United States and other countries.
-
-**Mac** and the Mac logo, **OpenCL** and the OpenCL logo, are trademarks of 
-Apple Inc., registered in the U.S. and other countries.
-
- Acknowledgements
-------------------
-
-The following parties are acknowledged for producing tools which are used within 
-Open CASCADE Technology libraries or for release preparation.
-
-You are hereby informed that all rights to the software listed below belong to its respective 
-authors and such software may not be freely available and/or be free of charge for any kind 
-of use or purpose. We strongly recommend that you carefully read the license of these products 
-and, in case you need any further information, directly contact their authors.
-
-**Qt** is a cross-platform application framework that is widely used for developing application software 
-with graphical user interface (GUI). Qt is free and open source software distributed under 
-the terms of the GNU Lesser General Public License. In OCCT Qt is used for programming samples. 
-If you need further information on Qt, please, refer to Qt Homepage (http://qt.digia.com).
-
-**Tcl** is a high-level programming language. Tk is a graphical user interface (GUI) toolkit, 
-with buttons, menus, listboxes, scrollbars, and so on. Taken together Tcl and Tk provide a solution 
-to develop cross-platform graphical user interfaces with a native look and feel. Tcl/Tk is under copyright by 
-Scriptics Corp., Sun Microsystems, and other companies. However, Tcl/Tk is an open source, and 
-the copyright allows you to use, modify, and redistribute Tcl/Tk for any purpose, without an 
-explicit license agreement and without paying any license fees or royalties. 
-To use Tcl/Tk, please refer to the Licensing Terms (http://www.tcl.tk/software/tcltk/license.html).
-
-**Robert Boehne** has developed **GNU Autoconf**, **Automake** and **Libtool** scripts and makefiles 
-for the Open CASCADE project http://sourceforge.net/projects/autoopencas/, 
-which became an initial groundwork for the build scripts based on respective GNU tools 
-(autoconf, automake and libtool) in Open CASCADE Technology version 4.0. 
-These scripts are now maintained by the OPEN CASCADE company.
-
-**GL2PS** is developed by Christophe Geuzaine and others. It is optionally used by OCCT to
-export content of OpenGL scene to vector graphics formats (PS, PDF, EMF, SVG). 
-The library is licensed under GL2PS LICENSE http://www.geuz.org/gl2ps/COPYING.GL2PS Version 2, November 2003.
-
-**FreeType 2** is developed by Antoine Leca, David Turner, Werner Lemberg and others. 
-It is a software font engine that is designed to be small, efficient, highly customizable and 
-portable while capable of producing high-quality output (glyph images). This product 
-can be used in graphic libraries, display servers, font conversion tools, 
-text image generation tools, and many other products.
-
-FreeType 2 is released under two open-source licenses: BSD-like FreeType License and the GPL.
-
-**Intel(R) Threading Building Blocks (TBB)** offers a rich and complete approach to expressing parallelism in a C++ program. 
-It is a library that helps you to take advantage of multi-core processor performance without having to be a threading expert. 
-Threading Building Blocks is not just a threads-replacement library. It represents a higher-level, task-based parallelism that 
-abstracts platform details and threading mechanisms for scalability and performance. 
-TBB is available under GPLv2 license with the runtime exception.
-
-Open CASCADE Technology WOK module on Windows also makes use of LGPL-licensed C routines **regexp** 
-and **getopt**, taken from GNU C library.
-
-**OpenGL** is an industry standard API for 3D graphics used by OCCT for 
-implementation of 3D viewer. OpenGL specification is developed by the
-Khronos group, http://www.khronos.org/opengl/. OCCT code includes header 
-file *glext.h* obtained from Khronos web site.
-
-**OpenCL** (Open Computing Language) is open, royalty-free standard for 
-cross-platform, parallel programming of modern processors, optionally used by 
-OCCT for ray tracing. OpenCL specification is developed by the
-Khronos group, http://www.khronos.org/opencl/. The implementations of OpenCL 
-are available from Apple, AMD, NVIDIA, Intel, and other vendors. 
-**OpenCL Installable Client Driver (ICD) Loader** is a library provided by
-Khronos group which allows dispatching OpenCL calls to underlying 
-implementation.
-
-**Doxygen** developed by Dimitri van Heesch is open source documentation system for 
-C++, C, Java, Objective-C, Python, IDL, PHP and C#. This product is used in Open CASCADE Technology 
-for automatic creation of Technical Documentation from C++ header files. 
-If you need further information on Doxygen, please refer to http://www.stack.nl/~dimitri/doxygen/index.html.
-
-**Graphviz** is open source graph visualization software developed by John Ellson, Emden Gansner, Yifan Hu and Arif Bilgin. 
-Graph visualization is representiation of structured information as diagrams of abstract graphs and networks. 
-This product is used together with Doxygen in Open CASCADE Technology for automatic creation of Technical Documentation 
-(generation of dependency graphs). Current versions of Graphviz are licensed on an open source 
-basis under The Eclipse Public License (EPL) (http://www.graphviz.org/License.php).
-
-**Inno Setup** is a free script-driven installation system created in CodeGear Delphi by Jordan Russell. 
-In OCCT Inno Setup is used to create Installation Wizard on Windows. 
-It is licensed under Inno Setup License (http://www.jrsoftware.org/files/is/license.txt).
-
-**FreeImage** is an Open Source library supporting popular graphics image formats, such as PNG, BMP, JPEG, TIFF, 
-and others used by multimedia applications. This library is developed by Hervé Drolon and Floris van den Berg. 
-FreeImage is easy to use, fast, multithreading safe, compatible with all 32-bit or 64-bit versions of Windows, 
-and cross-platform (works both with Linux and Mac OS X). FreeImage is optionally used by OCCT to work
-with images, on conditions of the FreeImage Public License (FIPL) (http://freeimage.sourceforge.net/freeimage-license.txt).
-
-**MikTEX** is up-to-date implementation of TeX/LaTeX and related programs for Windows. It is used 
-for generation of User and Developer Guides in PDF format. See http://miktex.org for information
-on this tool.
-
-Adobe Systems, Inc. provides **Adobe Reader**, which can be used to view files in Portable Document Format (PDF). 
-
-@section OCCT_OVW_SECTION_3 Documentation
-
-OCCT documentation is provided in several forms:
-
-- This overview provides general description of OCCT structure, functionality, modules, and features. 
-  It is available in HTML format (generated by Doxygen) and includes User and Developer Guides.
-  The sources of this documentation are contained in **dox** subdirectory of OCCT sources 
-  (plain text format is used, with mixed MarkDown / Doxygen syntax mark-up).
-
-- User and Developer Guides describing in details OCCT modules and development tools are also available in 
-  Adobe Portable Document Format (PDF). To read this format, you need Adobe Acrobat Reader, 
-  which is a freeware and can be downloaded from the Adobe site. 
-
-- Full reference documentation covering all OCCT classes generated automatically by Doxygen 
-  software is provided in HTML format, in a separate package. 
-  Reference documentation is presented in **Modules --> Toolkits --> Packages --> Classes** 
-  logic structure with cross-references to all OCCT classes and complete in-browser search by all classes.
-
-See @ref occt_dev_guides__documentation "OCCT Documentation Guide" for details on OCCT documentation system.
-
-**Generation of HTML documentation**
-
-To generate HTML documentation from sources contained in *dox* subdirectory, 
-you need to have Tcl and Doxygen 1.8.4 (or above) installed on your system.
-
-In Tcl prompt, cd to OCCT root folder and run 
-
-    tclsh> source dox/start.tcl
-
-On Windows you can also run batch script **gendoc.bat**.
-
-
-**Generation of reference documentation**
-
-Reference documentation can be generated with help of WOK tool that 
-is available for download from www.opencascade.org and dev.opencascade.org sites.
-
-Prerequisites:
-
-  * Doxygen version 1.8.4 or higher
-  * Graphviz version 2.28.0 or higher
-
-Run WOK (cd \<WOK_INSTALL_DIR\>/site folder):
-
-* Using WOK TCL shell:
-      > wok_tclsh.sh
-
-* Using Emacs editor:
-      > wok_emacs.sh
-
-In the WOK prompt, step into your workbench:
-
-      > wokcd <your workbench>
-
-In your workbench, use **wgendoc** command with –h argument to get information about arguments of **wgendoc** command:
-
-      > wgendoc -h
-
-then run **wgendoc** command with required arguments, for instance:
-
-      > wgendoc -output=d:/occt/doc {-m=Draw Visualization}
-
-@section OCCT_OVW_SECTION_5 Requirements
-
-Open CASCADE Technology is designed to be highly portable and is known to 
-work on wide range of platforms (UNIX, Linux, Windows, Mac OS X). 
-Current version is officially certified on Windows (IA-32 and x86-64), 
-Linux (x86-64) and MAC OS X (x86-64) platforms. 
-
-The tables below describe the recommended hardware and software configurations
-for which OCCT is certified to work.
-
-@subsection OCCT_OVW_SECTION_5_1 Linux
-
-| Operating System  | Mandriva 2010, CentOS 5.5, CentOS 6.3, Fedora 17, Fedora 18, Ubuntu-1304, Debian 6.0\*  |
-| ----- | ----- |
-| Minimum memory    | 512 MB, 1 GB recommended |
-| Free disk space (complete installation) | 600 MB approx. |
-| Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
-| C++      | GNU gcc 4.0.  - 4.7.3. |
-| TCL (for testing tools)    | Tcltk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/8.6.html |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (for text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (optional, for export contents of OCCT viewer to vector graphic files) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | OpenCL SDK (usually one provided by vendor of your graphic card) or OpenCL ICD Loader by Khronos group, http://www.khronos.org/registry/cl |
-
-* Debian 60 64 bit is a platform used for regular testing of contributions 
-
-@subsection OCCT_OVW_SECTION_5_2 Windows
-
-| Operating System | Windows 8 / 7 SP1 / Vista SP2 / XP SP3 |
-| ----- | ----- |
-| Minimum memory    | 512 MB, 1 GB recommended |
-| Free disk space (complete installation) | 600 MB approx. |
-| Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
-| C++ | Microsoft Visual Studio: 2005 SP1, 2008 SP1\*, 2010 SP1, 2012 Update 3, 2013 <br>Intel C++ Composer XE 2013 SP1 |
-| TCL (for testing tools) | ActiveTcl 8.5 or 8.6 http://www.activestate.com/activetcl/downloads |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | OpenCL SDK (usually one provided by vendor of your graphic card) or OpenCL ICD Loader by Khronos group, http://www.khronos.org/registry/cl |
-
-* VC++ 9 32-bit is used for certification of contributions and for building 
-  binary package of official release of OCCT on Windows.
-
-@subsection OCCT_OVW_SECTION_5_3 MAC OS X
-
-| Operating System | Mac OS X 10.9 Mavericks / 10.8 Mountain Lion / 10.7 Lion / 10.6.8 Snow Leopard |
-| ----- | ----- |
-| Minimum memory    | 512 MB, 1 GB recommended |
-| Free disk space (complete installation) | 600 MB approx. |
-| Video card | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
-| C++      | XCode 3.2 or newer (4.x is recommended) |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
-| gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
-| Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | Native OpenCL 1.2.8 | 
-
-@subsection overview_req_graphics Graphic cards
-
-For 3d viewer, graphic card or software implementation supporting OpenGL 1.1 
-or above is required. OpenGL 2.1+ is highly recommended.
-For ray tracing, hardware implementation of OpenCL 1.1+ is required.
-
-The following table lists graphic cards tested to work with OCCT.
-
-| Graphic card | Driver/GL/GLSL/CL version | OS | OpenGL (fixed pipeline) | OpenGL (shaders) | OpenCL (ray tracing) |
-| ---- | ---- | ---- | :----: | :----: | :----: |
-| NVIDIA GeForce GT 610, 630M, 640 | Driver 311.44, GL 4.3.0, GLSL 4.30 | Windows 7 64 bit | OK | OK | OK |
-| Intel(R) HD Graphics 3000 | GL 3.1.0, GLSL 1.40 | Windows 7 64 bit | OK | OK | none |
-| RadeOn 9600 | GL 2.1.8454, GLSL 1.20 | | OK | bad | none |
-| AMD/ATI RadeOn HD 7870 | Driver 6.14.10.12002, GL 4.2.12002, GLSL 4.20 | Windows 7 64-bit | OK | OK | OK |
-| Mesa 7.8.2 Windows GDI Driver\* | GL 2.1, GLSL version 1.20 | Mac OS X 10.6 / OS X 10.9 | OK | artifacts | none |
-| NVIDIA GeForce 320 |  | Mac OS X 10.6 / OS X 10.9 | OK | OK | OK on OSX 10.6, bad on OSX 10.9 |
-| NVIDIA GeForce 6600 GT | GL 2.1.2, GLSL 1.20 | Windows XP 32-bit | OK | OK | none |
-| Apple software OpenGL | | Mac OS X 10.6 / OS X 10.9 | OK | OK | OK |
-
-* Mesa implementation of OpenGL is used for certification testing of OCCT
-
-@section OCCT_OVW_SECTION_4 Installation
-
-In most cases you need to rebuild OCCT on your platform (OS, compiler) before
-using it in your project, to ensure binary compatibility.
-See @ref occt_dev_guides__building for instructions on
-building OCCT from sources on supported platforms.
-
-@subsection OCCT_OVW_SECTION_4_1 Using Windows installer
-
-On Windows Open CASCADE Technology can be installed with binaries precompiled by 
-Visual C++ 2008 with installation procedure.
-
-**Recommendation:**
-
-If you have a previous version of OCCT installed on your station, 
-and you do not plan to use it along with the new version, you might want to uninstall 
-the previous version (using Control Panel, Add/Remove Programs) before 
-the installation of this new version, to avoid possible problems 
-(conflict of system variables, paths, etc).
-
-**Attention:** For full installation OCCT requires approximately 650 Mb of disk space, 
-but during the installation process you will need 1,2 Gb of free disk space.
-
-OCCT installation with reference documentation requires 1,4 Gb on disk.
-
-  * Download the OCCT installer from OPEN CASCADE web site using the link. you have been provided
-  * Launch the installer and follow the instructions.
-
-The includes and binaries of third-party libraries necessary for building and launching 
-OCCT are included into binary distribution (built with Visual C++ 2008). 
-When the installation is complete, you will find the directories for 3rd party products 
-(some might be absent in case of custom installation) and the main **OCCT** directory:
-
-@image html /overview/images/overview_3rdparty.png 
-@image latex /overview/images/overview_3rdparty.png 
-
-The contents of the OCCT-6.7.0 directory (called further "OCCT root", or $CASROOT) are as follows: 
-
-@image html /overview/images/overview_installation.png "The directory tree"
-@image latex /overview/images/overview_installation.png "The directory tree"
-
-  * **adm**   This folder contains administration files, which allow rebuilding OCCT;
-  * **adm/cmake**  This folder contains files of CMake building procedure;
-  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++  2005, 2008 and 2010, which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
-  * **data**  This folder contains CAD files in different formats, which can be used to test the OCCT functionality;
-  * **doc**  This folder contains OCCT documentation in HTML and PDF format;
-  * **dox**  This folder contains sources of OCCT documentation in plain text (MarkDown) format;
-  * **drv**  This folder contains source files generated by WOK (private header files and instantiations of generic classes);
-  * **inc**  This folder contains all OCCT header files;
-  * **samples**  This folder contains sample applications.
-  * **src**  This folder contains OCCT source files. They are organized in folders, one per development unit;
-  * **tests**  This folder contains scripts for OCCT testing.
-  * **win32/vc9**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2008;
-
-@section OCCT_OVW_SECTION_4_2 Environment Variables
-
-To run any Open CASCADE Technology application you need to set the environment variables.
-
-### On Windows
-
-You can define the environment variables with env.bat script located in the 
-$CASROOT folder. This script accepts two arguments to be used: 
-the version of Visual Studio (vc8 - vc12) and the architecture (win32 or win64).
-
-The additional environment settings necessary for compiling OCCT libraries and samples 
-by Microsoft Visual Studio can be set using script custom.bat located in the same folder. 
-You might need to edit this script to correct the paths to third-party libraries 
-if they are installed on your system in a non-default location.
-
-Script msvc.bat can be used with the same arguments for immediate launch of Visual Studio for (re)compiling OCCT.
-
-### On Unix
-
-
-  If OCCT was built by Code::Blocks, you can define the environment variables with env_cbp.sh or custom_cbp.sh script.
-
-  If OCCT was built by Automake, you can define the environment variables with env_amk.sh or custom_amk.sh script.
-
-The scripts are located in the OCCT root folder.
-
- 
-### Description of system variables:
-
-
-  * **CASROOT** is used to define the root directory of Open CASCADE Technology;
-  * **PATH** is required to define the path to OCCT binaries and 3rdparty folder;
-  * **LD_LIBRARY_PATH** is required to define the path to OCCT libraries (on UNIX platforms only);
-  * **MMGT_OPT** (optional) if set to 1, the memory manager performs optimizations as described below; if set to 2, 
-    Intel (R) TBB optimized memory manager is used; if 0 (default), every memory block is allocated 
-    in C memory heap directly (via malloc() and free() functions). 
-    In the latter case, all other options except MMGT_CLEAR  and MMGT_REENTRANT are ignored;
-  * **MMGT_CLEAR** (optional) if set to 1 (default), every allocated memory block is cleared by zeros; 
-    if set to 0, memory block is returned as it is;
-  * **MMGT_CELLSIZE** (optional) defines the maximal size of blocks allocated in large pools of memory. Default is 200;
-  * **MMGT_NBPAGES** (optional) defines the size of memory chunks allocated for small blocks in pages 
-    (operating-system dependent). Default is 10000;
-  * **MMGT_THRESHOLD** (optional) defines the maximal size of blocks that are recycled internally 
-    instead of being returned to the heap. Default is 40000;
-  * **MMGT_MMAP** (optional) when set to 1 (default), large memory blocks are allocated using 
-    memory mapping functions of the operating system; if set to 0, 
-    they will be allocated in the C heap by malloc();
-  * **CSF_LANGUAGE** is required to define the default language of messages;
-  * **CSF_DEBUG** (optional, Windows only): if defined then a diagnostic message is displayed in case of an exception;
-  * **CSF_DEBUG_BOP** (optional): if defined then it should specify directory where diagnostic data on problems occured in Boolean operations will be saved;
-  * **CSF_MDTVTexturesDirectory** defines the directory for available textures when using texture mapping;
-  * **CSF_ShadersDirectory** defines the directory for GLSL programs (required for advanced rendering techniques and custom shaders);
-  * **CSF_UnitsDefinition** and **CSF_UnitsLexicon** should define paths to resource files Lexi_Expr.dat and Units.dat, respectively, required for support of measurement units;
-  * **CSF_SHMessage** is required in order to define the path to the messages file for *ShapeHealing*;
-  * **CSF_XSMessage** is required in order to define the path to the messages file for **STEP** and **IGES** translators;
-  * **CSF_StandardDefaults** and **CSF_PluginDefaults** are required in order to maintain CASCADE Persistence mechanism to make possible any open/save operations with OCAF documents;
-  * **CSF_StandardLiteDefaults** is required in order to maintain *OCCT Persistence mechanism* to make possible any open/save operations with Lite OCAF documents;
-  * **CSF_XCAFDefaults**  any open/save operations for **XDE** documents;
-  * **CSF_IGESDefaults** and **CSF_STEPDefaults** are required for **IGES** and **STEP** translators correspondingly in order to define the path to the resource files;
-  * **CSF_XmlOcafResource** is required in order to set the path to **XSD** resources, which defines XML grammar.
-  * **CSF_MIGRATION_TYPES** is required in order to read documents that contain old data types, such as *TDataStd_Shape*;
-  * **TCLLIBPATH**, **TCL_LIBRARY**, **TK_LIBRARY** and **TIX_LIBRARY** are required to allow work with **DRAW** and **WOK**.
-
-@section OCCT_OVW_SECTION_7 Getting Started
-
-@subsection OCCT_OVW_SECTION_7_1 Draw Test Harness
-
-Draw is a command interpreter based on TCL and a graphical system used for testing and demonstrating OCCT modeling libraries.
-
-Draw can be used interactively to create, display and modify objects such as curves, surfaces and topological shapes.
-
-@image html /overview/images/overview_draw.png
-@image latex /overview/images/overview_draw.png
-
-Scripts can be written to customize Draw and perform tests. 
-New types of objects and new commands can be added using C++ programming language.
-
-Draw contains:
-
-  * A command interpreter based on TCL command language.
-  * A 2D an 3D graphic viewer with support of operations such as zoom, pan, rotation and full-screen views.
-  * An optional set of geometric commands to create and modify curves and surfaces and to use OCCT geometry algorithms.
-  * A set of topological commands to create and modify BRep shapes and to use OCCT topology algorithms.
-  * A set of graphic commands for view and display operations including Mesh Visualization Service.
-  * A set of Application framework commands for handling of files and attributes.
-  * A set of Data Exchange commands for translation of files from various formats (IGES,STEP) into OCCT shapes.
-  * A set of Shape Healing commands: check of overlapping edges, approximation of a shape to BSpline, etc.  
-
-You can add new custom test harness commands to Draw in order to test 
-or demonstrate a new functionality, which you are developing.
-
-Currently DRAW Test Harness is a single executable called DRAWEXE.
-
-Commands grouped in toolkits can be loaded at run-time thereby implementing dynamically loaded plug-ins. 
-Thus you can work only with the commands that suit your needs adding 
-the commands dynamically without leaving the Test Harness session.
-
-Declaration of available plug-ins is done through special resource file(s). 
-The pload command loads the plug-in in accordance with 
-the specified resource file and activates the commands implemented in the plug-in.
-
-The whole process of using the plug-in mechanism as well as the instructions for extending Test Harness is described in the @ref occt_user_guides__test_harness.
-
-Draw Test Harness provides an environment for OCCT automated testing system. 
-Please, consult its @ref occt_dev_guides__tests "Automated Testing System" for details.
-
-Remarks:
-
-* The DRAWEXE executable is delivered with the installation procedure on Windows platform only.
-* To start it, launch DRAWEXE executable from Open CASCADE Technology/Draw Test Harness item of the Start\\Programs menu.
-
-@subsection OCCT_OVW_SECTION_7_2 Experimenting with Draw Test Harness
-
- Running Draw
-------------
-
-**On Linux:**
-
-1. If OCCT was built by Code::Blocks  use <i>$CASROOT/draw_cbp.sh</i> file to launch *DRAWEXE* executable;
-2. If OCCT was built by Automake    use <i>$CASROOT/draw_amk.sh</i> file to launch *DRAWEXE* executable;
-
-Draw[1]> prompt appears in the command window
-
-Type *pload ALL*
-
-**On Windows:**
-
-Launch Draw executable from Open CASCADE Technology\\Test Harness\\Draw Test Harness 
-item of the Start\\Programs menu or Use <i>$CASROOT\\draw.bat</i> file to launch *DRAWEXE* executable.
-
-Draw[1]> prompt appears in the command window
-
-Type pload ALL
-
-**Creating your first geometric objects**
-
-1. In the command window, type *axo* to create an axonometric view
-2. Type *box b -10 -10 -10 20 20 20* to create a cube *b* of size 20, parallel to the X Y Z axis and centered on the origin. The cube will be displayed in the axonometric view in wireframe mode.
-3. Type *fit* to fill the viewer with the cube
-4. Type *pcylinder c 2 30* to create a cylinder *c* of radius 2 and height 30. The cylinder will be displayed in addition to the cube
-
-**Manipulating the view**
-
-1. Type *clear* to erase the view
-2. Type *donly c* to display the cylinder only
-3. Type *donly b* to display the cube only
-4. Type *hlr hlr b* to display the cube in the hidden line removal mode
-
-**Running demonstration files**
-
-1. Type *cd ../..* to return to the root directory
-2. Type *cd samples/tcl* to reach the *DrawResources* directory
-3. Type *source \<demo_file\>* to run the demonstration file provided with Open CASCADE. The following demonstration files are available:
-  * DataExchangeDemo.tcl: demonstrates sample sequence of operations with writing and reading IGES file
-  * ModelingDemo.tcl: demonstrates creation of simple shape and displaying it in HLR mode
-  * VisualizationDemo.tcl: demonstrates use of 3d viewer
-  * challenge.tcl: creates solid shape looking like abbreviation "CAD"
-  * bottle.tcl: creates bottle as in OCCT Tutorial
-  * drill.tcl: creates twist drill bit shape
-  * mill.tcl: creates milling cutter shape
-  * raytrace.tcl: demonstrates use of ray tracing display in 3d viewer
-
-**Getting Help**
-
-1. Type *help* to see all available commands
-2. Type *help \<command_name\>* to find out the arguments for a given command
-
-@subsection OCCT_OVW_SECTION_7_3 Programming Samples
-
-@subsubsection OCCT_OVW_SECTION_7_3_1 MFC 
-
-Visual C++ programming samples containing 10 Visual C++ projects 
-illustrating how to use a particular module or functionality.
-
-The list of MFC samples:
-
-  * Geometry
-  * Modeling
-  * Viewer2d
-  * Viewer3d
-  * ImportExport
-  * Ocaf
-  * Triangulation
-  * HLR
-  * Animation
-  * Convert
-
-@image html /overview/images/overview_mvc.png
-@image latex /overview/images/overview_mvc.png
-
-**Remarks:**
-
-  * MFC samples are available only on Windows platform;
-  * To start a sample use Open CASCADE Technology\\Samples\\Mfc\\ item of the Start\\Programs menu;
-  * Read carefully readme.txt to learn about launching and compilation options.
-
-See \subpage samples_mfc_standard "Readme" for details.
-
-@subsubsection OCCT_OVW_SECTION_7_3_2 Qt
-
-OCCT contains three samples based on Qt application framework
-
- Import Export
--------------
-
- Import Export programming sample contains 3D Viewer and Import / Export functionality.
-
-@image html /overview/images/overview_qt.png
-@image latex /overview/images/overview_qt.png
-
- Tutorial
----------
-
-The Qt programming tutorial teaches how to use Open CASCADE Technology services to model a 3D object. 
-The purpose of the tutorial is not to explain all OCCT classes but 
-to help start thinking in terms of the Open CASCADE Technology.
-
-This tutorial assumes that  the user has experience in using and setting up C++. 
-From the viewpoint of programming, Open CASCADE Technology is designed 
-to enhance user's C++ tools with high performance modeling classes, methods and functions. 
-The combination of these resources allows creating substantial applications.
-
-**See also:** @ref occt__tutorial "OCCT Tutorial" 
-
- Voxel
-------
-
-This is a demonstration application showing OCCT voxel models. It also includes a set of non-regression tests and other commands for testing this functionality (accessible only through TEST pre-processor definition).
-
-**See also:** <a href="occt_voxels_wp.html">Voxels User's guide</a> 
-
-**Remarks:**
-
-  * Qt samples are available on all supported platforms;
-  * To start a sample on Windows use Open CASCADE Technology\\Samples\\Qt\\ item of the Start\\Programs menu.
-
-@subsubsection OCCT_OVW_SECTION_7_3_3 C#
-
-C# sample demonstrates integration of OCCT 3D Viewer and Import / Export functionality into .NET applications (using Windows Forms and WPF front ends).
-
-@image html /overview/images/overview_c__ie.png
-@image latex /overview/images/overview_c__ie.png
-
-Import:
-
-  * BRep
-  * Iges
-  * Step
-
-Export: 
-
-  * Brep
-  * Iges
-  * Step
-  * Stl
-  * Vrml
-
-See \subpage samples_csharp "Readme" for details.
-

dox/overview/overview.md

@@ -1,4 +1,4 @@
-Overview {#mainpage}
+Overview {#mainpage}
 ========
 
 @tableofcontents
@@ -20,7 +20,7 @@ http://www.opencascade.org
 @section OCCT_OVW_SECTION_2 Copyrights
 
 Open CASCADE Technology and all materials, including this documentation, is 
-Copyright (c) 1999-2013 by OPEN CASCADE S.A.S. All rights reserved.
+Copyright (c) 1999-2015 by OPEN CASCADE S.A.S. All rights reserved.
 
 @htmlonly<center>@endhtmlonly
 http://www.opencascade.com
@@ -58,8 +58,7 @@ OPEN CASCADE S.A.S.
 
 **Windows** is a registered trademark of Microsoft Corporation in the United States and other countries.
 
-**Mac** and the Mac logo, **OpenCL** and the OpenCL logo, are trademarks of 
-Apple Inc., registered in the U.S. and other countries.
+**Mac** and the Mac logo are trademarks of Apple Inc., registered in the U.S. and other countries.
 
  Acknowledgements
 ------------------
@@ -117,14 +116,7 @@ implementation of 3D viewer. OpenGL specification is developed by the
 Khronos group, http://www.khronos.org/opengl/. OCCT code includes header 
 file *glext.h* obtained from Khronos web site.
 
-**OpenCL** (Open Computing Language) is open, royalty-free standard for 
-cross-platform, parallel programming of modern processors, optionally used by 
-OCCT for ray tracing. OpenCL specification is developed by the
-Khronos group, http://www.khronos.org/opencl/. The implementations of OpenCL 
-are available from Apple, AMD, NVIDIA, Intel, and other vendors. 
-**OpenCL Installable Client Driver (ICD) Loader** is a library provided by
-Khronos group which allows dispatching OpenCL calls to underlying 
-implementation.
+**VTK** - The **Visualization Toolkit (VTK)** is an open-source, freely available software system for 3D computer graphics, image processing and visualization. OCCT VIS component provides adaptation functionality for visualization of OCCT topological shapes by means of VTK library. If you need further information on VTK, please, refer to VTK Homepage http://www.vtk.org/.
 
 **Doxygen** developed by Dimitri van Heesch is open source documentation system for 
 C++, C, Java, Objective-C, Python, IDL, PHP and C#. This product is used in Open CASCADE Technology 
@@ -176,7 +168,7 @@ See @ref occt_dev_guides__documentation "OCCT Documentation Guide" for details o
 **Generation of HTML documentation**
 
 To generate HTML documentation from sources contained in *dox* subdirectory, 
-you need to have Tcl and Doxygen 1.8.4 (or above) installed on your system.
+you need to have Tcl and Doxygen 1.8.5 (or above) installed on your system.
 
 In Tcl prompt, cd to OCCT root folder and run 
 
@@ -192,7 +184,7 @@ is available for download from www.opencascade.org and dev.opencascade.org sites
 
 Prerequisites:
 
-  * Doxygen version 1.8.4 or higher
+  * Doxygen version 1.8.5 or higher
   * Graphviz version 2.28.0 or higher
 
 Run WOK (cd \<WOK_INSTALL_DIR\>/site folder):
@@ -218,86 +210,95 @@ then run **wgendoc** command with required arguments, for instance:
 @section OCCT_OVW_SECTION_5 Requirements
 
 Open CASCADE Technology is designed to be highly portable and is known to 
-work on wide range of platforms (UNIX, Linux, Windows, Mac OS X). 
+work on wide range of platforms (UNIX, Linux, Windows, Mac OS X, Android). 
 Current version is officially certified on Windows (IA-32 and x86-64), 
-Linux (x86-64) and MAC OS X (x86-64) platforms. 
+Linux (x86-64), MAC OS X (x86-64) and Android (4.0.4 armv7) platforms. 
 
 The tables below describe the recommended hardware and software configurations
 for which OCCT is certified to work.
 
 @subsection OCCT_OVW_SECTION_5_1 Linux
 
-| Operating System  | Mandriva 2010, CentOS 5.5, CentOS 6.3, Fedora 17, Fedora 18, Ubuntu-1304, Debian 6.0\*  |
+| Operating System  | Mandriva 2010, CentOS 5.5, CentOS 6.3, Fedora 17, Fedora 18, Ubuntu 13.04, Debian 6.0\*  |
 | ----- | ----- |
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
 | Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
+| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
 | C++      | GNU gcc 4.0.  - 4.7.3. |
-| TCL (for testing tools)    | Tcltk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/8.6.html |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (for text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
+| TCL (for testing tools)    | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html |
+| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
+| Freetype (for text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
+| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
 | gl2ps (optional, for export contents of OCCT viewer to vector graphic files) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | OpenCL SDK (usually one provided by vendor of your graphic card) or OpenCL ICD Loader by Khronos group, http://www.khronos.org/registry/cl |
+| VTK (for VTK Integration Services | VTK 6.1.0 http://www.vtk.org/VTK/resources/software.html |
 
-* Debian 60 64 bit is a platform used for regular testing of contributions 
+* Debian 6.0 64 bit is a platform used for regular testing of contributions
 
 @subsection OCCT_OVW_SECTION_5_2 Windows
 
-| Operating System | Windows 8 / 7 SP1 / Vista SP2 / XP SP3 |
+| Operating System | Windows 8.1 / 7 SP1 / Vista SP2 / XP SP3 |
 | ----- | ----- |
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
 | Video card   | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
-| C++ | Microsoft Visual Studio: 2005 SP1, 2008 SP1\*, 2010 SP1, 2012 Update 3, 2013 <br>Intel C++ Composer XE 2013 SP1 |
-| TCL (for testing tools) | ActiveTcl 8.5 or 8.6 http://www.activestate.com/activetcl/downloads |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
+| Graphic library | OpenGL 3.3+, OpenGL ES 2.0+ |
+| C++ | Microsoft Visual Studio: 2005 SP1, 2008 SP1, 2010 SP1 \*, 2012 Update 3, 2013 <br>Intel C++ Composer XE 2013 SP1 |
+| TCL (for testing tools) | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html  |
+| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
+| Freetype (OCCT Text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
+| FreeImage (Support of common graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
 | gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | OpenCL SDK (usually one provided by vendor of your graphic card) or OpenCL ICD Loader by Khronos group, http://www.khronos.org/registry/cl |
+| VTK (for VTK Integration Services | VTK 6.1.0 http://www.vtk.org/VTK/resources/software.html |
 
-* VC++ 9 32-bit is used for certification of contributions and for building 
+* VC++ 10 64-bit is used for certification of contributions and for building 
   binary package of official release of OCCT on Windows.
 
 @subsection OCCT_OVW_SECTION_5_3 MAC OS X
 
-| Operating System | Mac OS X 10.9 Mavericks / 10.8 Mountain Lion / 10.7 Lion / 10.6.8 Snow Leopard |
+| Operating System | OS X 10.10 Yosemite / 10.9 Mavericks / 10.8 Mountain Lion / 10.7 Lion / 10.6.8 Snow Leopard |
 | ----- | ----- |
 | Minimum memory    | 512 MB, 1 GB recommended |
 | Free disk space (complete installation) | 600 MB approx. |
-| Video card | See \ref overview_req_graphics |
-| Graphic library | OpenGL 1.1+ (OpenGL 2.1+ is recommended)|
 | C++      | XCode 3.2 or newer (4.x is recommended) |
-| Qt (for demonstration tools) | Qt 4.6.2 http://qt.nokia.com/downloads |
-| Freetype (OCCT Text rendering) | freetype-2.4.11 http://sourceforge.net/projects/freetype/files/ |
-| FreeImage (Support of common graphic formats) | FreeImage 3.15.4 http://sourceforge.net/projects/freeimage/files |
+| TCL (for testing tools)    | Tcl/Tk 8.5 or 8.6 http://www.tcl.tk/software/tcltk/download.html |
+| Qt (for demonstration tools) | Qt 4.8.6 http://qt-project.org/downloads |
+| Freetype (OCCT Text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
+| FreeImage (Support of common graphic formats) | FreeImage 3.16.0 http://sourceforge.net/projects/freeimage/files |
 | gl2ps (Export contents of OCCT viewer to vector graphic file) | gl2ps-1.3.8  http://geuz.org/gl2ps/ |
 | Intel TBB (optional, for multithreaded algorithms) | TBB 3.x or 4.x http://www.threadingbuildingblocks.org/ |
-| OpenCL (optional, for ray tracing visualization) | Native OpenCL 1.2.8 | 
+
+@subsection OCCT_OVW_SECTION_5_4 Android
+
+| Operating System  | Android 4.0.4+  |
+| ----- | ----- |
+| Minimum memory | 512 MB, 1 GB recommended |
+| C++      | NDK r10, GNU gcc 4.8 or newer |
+| Qt (for demonstration tools) | Qt 5.3.2 http://qt-project.org/downloads |
+| Freetype (for text rendering) | freetype-2.5.3 http://sourceforge.net/projects/freetype/files/ |
 
 @subsection overview_req_graphics Graphic cards
 
-For 3d viewer, graphic card or software implementation supporting OpenGL 1.1 
-or above is required. OpenGL 2.1+ is highly recommended.
-For ray tracing, hardware implementation of OpenCL 1.1+ is required.
+On desktop, 3D viewer requires graphic card or software implementation supporting OpenGL 1.1 or above. OpenGL 2.1+ is highly recommended.
+Ray tracing requires OpenGL 4.0+ or OpenGL 3.1+ with GL_ARB_texture_buffer_object_rgb32 extension. Textures within ray tracing will be available only when GL_ARB_bindless_texture extension is provided by driver.
+
+On mobile platforms, OpenGL ES 2.0+ is required for 3D viewer. The ray tracing is not yet available on mobile platforms.
+Some old hardware might be unable to execute complex GLSL programs (e.g. with high number of light sources, clipping planes).
 
 The following table lists graphic cards tested to work with OCCT.
 
-| Graphic card | Driver/GL/GLSL/CL version | OS | OpenGL (fixed pipeline) | OpenGL (shaders) | OpenCL (ray tracing) |
+| Graphic card                     | Driver                           | OS                         | OpenGL (fixed pipeline) | OpenGL (shaders) | OpenGL (ray tracing) |
 | ---- | ---- | ---- | :----: | :----: | :----: |
-| NVIDIA GeForce GT 610, 630M, 640 | Driver 311.44, GL 4.3.0, GLSL 4.30 | Windows 7 64 bit | OK | OK | OK |
-| Intel(R) HD Graphics 3000 | GL 3.1.0, GLSL 1.40 | Windows 7 64 bit | OK | OK | none |
-| RadeOn 9600 | GL 2.1.8454, GLSL 1.20 | | OK | bad | none |
-| AMD/ATI RadeOn HD 7870 | Driver 6.14.10.12002, GL 4.2.12002, GLSL 4.20 | Windows 7 64-bit | OK | OK | OK |
-| Mesa 7.8.2 Windows GDI Driver\* | GL 2.1, GLSL version 1.20 | Mac OS X 10.6 / OS X 10.9 | OK | artifacts | none |
-| NVIDIA GeForce 320 |  | Mac OS X 10.6 / OS X 10.9 | OK | OK | OK on OSX 10.6, bad on OSX 10.9 |
-| NVIDIA GeForce 6600 GT | GL 2.1.2, GLSL 1.20 | Windows XP 32-bit | OK | OK | none |
-| Apple software OpenGL | | Mac OS X 10.6 / OS X 10.9 | OK | OK | OK |
+| NVIDIA GeForce GTX 650     | Driver 340.52, OpenGL 4.4        | Windows 7 64 bit           | OK | OK  | OK |
+| AMD/ATI RadeOn HD 7870     | Driver 14.100, OpenGL 4.4        | Windows 7 64-bit           | OK | OK  | OK |
+| Intel(R) HD Graphics 2500  | Driver 10.18.10.3621, OpenGL 4.0 | Windows 7 64 bit           | OK | OK  | limited (no textures) |
+| RadeOn 9600                | OpenGL 2.1.8454                  | Windows XP 32-bit          | OK | bad | unsupported by hardware |
+| NVIDIA GeForce 6600 GT     | OpenGL 2.1                       | Windows XP 32-bit          | OK | OK  | unsupported by hardware |
+| NVIDIA GeForce 320         | N/A                              | Mac OS X 10.6 / OS X 10.10 | OK | OK  | not yet supported by OCCT |
+| Apple software OpenGL      | N/A                              | Mac OS X 10.6 / OS X 10.10 | OK | OK  | N/A |
+| Mesa 10.2.4 \*             | "Gallium 0.4 on llvmpipe (LLVM 3.4, 256 bits)" OpenGL 3.0 | Windows 7 64 bit   | OK | OK  | unsupported by software |
 
 * Mesa implementation of OpenGL is used for certification testing of OCCT
 
@@ -311,7 +312,7 @@ building OCCT from sources on supported platforms.
 @subsection OCCT_OVW_SECTION_4_1 Using Windows installer
 
 On Windows Open CASCADE Technology can be installed with binaries precompiled by 
-Visual C++ 2008 with installation procedure.
+Visual C++ 2010 with installation procedure.
 
 **Recommendation:**
 
@@ -330,21 +331,21 @@ OCCT installation with reference documentation requires 1,4 Gb on disk.
   * Launch the installer and follow the instructions.
 
 The includes and binaries of third-party libraries necessary for building and launching 
-OCCT are included into binary distribution (built with Visual C++ 2008). 
+OCCT are included into binary distribution (built with Visual C++ 2010). 
 When the installation is complete, you will find the directories for 3rd party products 
 (some might be absent in case of custom installation) and the main **OCCT** directory:
 
 @image html /overview/images/overview_3rdparty.png 
 @image latex /overview/images/overview_3rdparty.png 
 
-The contents of the OCCT-6.7.0 directory (called further "OCCT root", or $CASROOT) are as follows: 
+The contents of the OCCT-6.9.0 directory (called further "OCCT root", or $CASROOT) are as follows:
 
 @image html /overview/images/overview_installation.png "The directory tree"
 @image latex /overview/images/overview_installation.png "The directory tree"
 
   * **adm**   This folder contains administration files, which allow rebuilding OCCT;
   * **adm/cmake**  This folder contains files of CMake building procedure;
-  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++  2005, 2008 and 2010, which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
+  * **adm/msvc**  This folder contains Visual Studio projects for Visual C++  2005, 2008, 2010, 2012 and 2013 which allow rebuilding OCCT under Windows platform in 32 and 64-bit mode;
   * **data**  This folder contains CAD files in different formats, which can be used to test the OCCT functionality;
   * **doc**  This folder contains OCCT documentation in HTML and PDF format;
   * **dox**  This folder contains sources of OCCT documentation in plain text (MarkDown) format;
@@ -353,7 +354,7 @@ The contents of the OCCT-6.7.0 directory (called further "OCCT root", or $CASROO
   * **samples**  This folder contains sample applications.
   * **src**  This folder contains OCCT source files. They are organized in folders, one per development unit;
   * **tests**  This folder contains scripts for OCCT testing.
-  * **win32/vc9**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2008;
+  * **win64/vc10**  This folder contains executable and library files built in optimize mode for Windows platform by Visual C++  2010;
 
 @section OCCT_OVW_SECTION_4_2 Environment Variables
 
@@ -384,14 +385,13 @@ The scripts are located in the OCCT root folder.
  
 ### Description of system variables:
 
-
   * **CASROOT** is used to define the root directory of Open CASCADE Technology;
   * **PATH** is required to define the path to OCCT binaries and 3rdparty folder;
   * **LD_LIBRARY_PATH** is required to define the path to OCCT libraries (on UNIX platforms only);
   * **MMGT_OPT** (optional) if set to 1, the memory manager performs optimizations as described below; if set to 2, 
     Intel (R) TBB optimized memory manager is used; if 0 (default), every memory block is allocated 
     in C memory heap directly (via malloc() and free() functions). 
-    In the latter case, all other options except MMGT_CLEAR  and MMGT_REENTRANT are ignored;
+    In the latter case, all other options except MMGT_CLEAR are ignored;
   * **MMGT_CLEAR** (optional) if set to 1 (default), every allocated memory block is cleared by zeros; 
     if set to 0, memory block is returned as it is;
   * **MMGT_CELLSIZE** (optional) defines the maximal size of blocks allocated in large pools of memory. Default is 200;
@@ -511,11 +511,14 @@ Type pload ALL
   * DataExchangeDemo.tcl: demonstrates sample sequence of operations with writing and reading IGES file
   * ModelingDemo.tcl: demonstrates creation of simple shape and displaying it in HLR mode
   * VisualizationDemo.tcl: demonstrates use of 3d viewer
-  * challenge.tcl: creates solid shape looking like abbreviation "CAD"
+  * cad.tcl: creates solid shape looking like abbreviation "CAD"
   * bottle.tcl: creates bottle as in OCCT Tutorial
   * drill.tcl: creates twist drill bit shape
-  * mill.tcl: creates milling cutter shape
+  * cutter.tcl: creates milling cutter shape
+  * xde.tcl: demonstrates creation of simple assembly in XDE
+  * materials.tcl: demonstrates visual properties of materials supported by 3d viewer
   * raytrace.tcl: demonstrates use of ray tracing display in 3d viewer
+  * dimensions.tcl: demonstrates use of dimensions, clipping, and capping in 3d viewer
 
 **Getting Help**
 
@@ -612,5 +615,22 @@ Export:
   * Stl
   * Vrml
 
-See \subpage samples_csharp "Readme" for details.
+See \subpage samples_csharp_occt "Readme" for details.
 
+There is also another C# example with the same functionality, which demonstrates the integration of Direct3D Viewer into .NET applications using WPF front end.
+
+See \subpage samples_csharp_direct3d "Readme" for details.
+
+@subsubsection OCCT_OVW_SECTION_7_3_4 Android
+
+There are two samples are representing usage OCCT framework on Android mobile platform. They represent an OCCT-based 3D-viewer with CAD import support in formats BREP, STEP and IGES: jniviewer (java) and AndroidQt (qt+qml)
+
+jniviewer
+@image html /overview/images/samples_java_android_occt.jpg
+@image latex /overview/images/samples_java_android_occt.jpg
+Java - See \subpage samples_java_android_occt "Readme" for details.
+
+AndroidQt
+@image html /overview/images/samples_qml_android_occt.jpg
+@image latex /overview/images/samples_qml_android_occt.jpg
+Qt - See \subpage samples_qml_android_occt "Readme" for details.

dox/user_guides/boolean_operations/images/boolean_image001.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="169.595"
+   height="115.66244"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="boolean_image001.svg">
+  <defs
+     id="defs4">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect2990"
+         height="17.998533"
+         width="17.278183"
+         y="14.642874"
+         x="3.1828232" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect2993"
+         height="18.151062"
+         width="17.429747"
+         y="17.388412"
+         x="54.86581" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="49.849591"
+     inkscape:cy="76.436836"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1042"
+     inkscape:window-height="640"
+     inkscape:window-x="18"
+     inkscape:window-y="263"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-99.629249,-395.59893)">
+    <g
+       id="g2995"
+       transform="matrix(2.2499232,0,0,2.2499232,101.67528,395.53094)">
+      <text
+         id="text2997"
+         style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
+         y="12.507455"
+         x="-0.90937805"
+         xml:space="preserve"> </text>
+      <path
+         id="path2999"
+         d="m 25.415222,0.49572229 c -13.84907,0 -25.07420523,11.29674871 -25.07420523,25.23417171 0,13.937423 11.22513523,25.234171 25.07420523,25.234171 13.84907,0 25.074205,-11.296748 25.074205,-25.234171 0,-13.937423 -11.225135,-25.23417171 -25.074205,-25.23417171"
+         style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3001"
+         d="m 24.941588,20.772671 c -2.491317,0 -4.518473,2.040088 -4.518473,4.547298 0,2.507211 2.027156,4.537766 4.518473,4.537766 2.491317,0 4.518472,-2.030555 4.518472,-4.537766 0,-2.50721 -2.027155,-4.547298 -4.518472,-4.547298"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3003"
+         d="m 24.941588,20.772671 c -2.491317,0 -4.518473,2.040088 -4.518473,4.547298 0,2.507211 2.027156,4.537766 4.518473,4.537766 2.491317,0 4.518472,-2.030555 4.518472,-4.537766 0,-2.50721 -2.027155,-4.547298 -4.518472,-4.547298"
+         style="fill:none;stroke:#000000;stroke-width:2.84180641px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text3005"
+         style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="27.60792"
+         x="3.1828232"
+         xml:space="preserve">V</text>
+      <text
+         id="text3007"
+         style="font-size:8.79065418px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="29.590809"
+         x="12.428167"
+         xml:space="preserve">1</text>
+      <text
+         id="text3009"
+         style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="27.60792"
+         x="17.429747"
+         xml:space="preserve"> </text>
+      <path
+         id="path3011"
+         d="m 50.11052,0.49572229 c -13.84907,0 -25.074206,11.29674871 -25.074206,25.23417171 0,13.937423 11.225136,25.234171 25.074206,25.234171 13.84907,0 25.064732,-11.296748 25.064732,-25.234171 0,-13.937423 -11.215662,-25.23417171 -25.064732,-25.23417171"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3013"
+         d="m 49.636885,20.772671 c -2.491317,0 -4.518472,2.040088 -4.518472,4.547298 0,2.507211 2.027155,4.537766 4.518472,4.537766 2.491317,0 4.509,-2.030555 4.509,-4.537766 0,-2.50721 -2.017683,-4.547298 -4.509,-4.547298"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3015"
+         d="m 49.636885,20.772671 c -2.491317,0 -4.518472,2.040088 -4.518472,4.547298 0,2.507211 2.027155,4.537766 4.518472,4.537766 2.491317,0 4.509,-2.030555 4.509,-4.537766 0,-2.50721 -2.017683,-4.547298 -4.509,-4.547298"
+         style="fill:none;stroke:#000000;stroke-width:2.84180641px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text3017"
+         style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="30.353456"
+         x="54.86581"
+         xml:space="preserve">V</text>
+      <text
+         id="text3019"
+         style="font-size:8.79065418px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="32.336346"
+         x="64.111153"
+         xml:space="preserve">2</text>
+      <text
+         id="text3021"
+         style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
+         y="30.353456"
+         x="69.112732"
+         xml:space="preserve"> </text>
+      <path
+         id="path2999-0"
+         d="m 48.910577,0.49552764 c -13.84907,0 -25.074205,11.29674836 -25.074205,25.23417136 0,13.937423 11.225135,25.234171 25.074205,25.234171 13.849066,0 25.074206,-11.296748 25.074206,-25.234171 0,-13.937423 -11.22514,-25.23417136 -25.074206,-25.23417136"
+         style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.105;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4048"
+         sodipodi:cx="28.721825"
+         sodipodi:cy="25.876774"
+         sodipodi:rx="3.368609"
+         sodipodi:ry="3.368609"
+         d="m 32.090434,25.876774 c 0,1.860431 -1.508178,3.368609 -3.368609,3.368609 -1.860432,0 -3.368609,-1.508178 -3.368609,-3.368609 0,-1.860432 1.508177,-3.368609 3.368609,-3.368609 1.860431,0 3.368609,1.508177 3.368609,3.368609 z"
+         transform="translate(-4.1006914,-0.50166522)" />
+    </g>
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image010.svg

@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="194.92216"
+   height="180.60326"
+   id="svg5925"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 17">
+  <defs
+     id="defs5927">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect5960"
+         height="189.81496"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect5963"
+         height="15.905443"
+         width="26.550388"
+         y="34.661861"
+         x="70.801033" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect5966"
+         height="15.755392"
+         width="26.70039"
+         y="89.88076"
+         x="143.8521" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.6743432"
+     inkscape:cx="56.701334"
+     inkscape:cy="90.302547"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5968"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1099"
+     inkscape:window-height="774"
+     inkscape:window-x="132"
+     inkscape:window-y="132"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5930">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-379.68462,-739.20433)">
+    <g
+       id="g5937" />
+    <g
+       id="g5948" />
+    <g
+       id="g5968"
+       transform="translate(355.90361,729.99263)">
+      <text
+         id="text5970"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="189.81496"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path5972"
+         d="m 70.744783,34.624349 0,15.942956 26.681639,0 0,-15.942956 -26.681639,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text5974"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.365868"
+         x="77.851135"
+         xml:space="preserve">E</text>
+      <text
+         id="text5976"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="48.316532"
+         x="86.101257"
+         xml:space="preserve">2</text>
+      <text
+         id="text5978"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.365868"
+         x="90.301315"
+         xml:space="preserve"> </text>
+      <path
+         id="path5980"
+         d="m 143.87085,89.76822 0,15.88669 26.62539,0 0,-15.88669 -26.62539,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text5982"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="101.73481"
+         x="150.90221"
+         xml:space="preserve">E</text>
+      <text
+         id="text5984"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="103.68548"
+         x="159.15231"
+         xml:space="preserve">1</text>
+      <text
+         id="text5986"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="101.73481"
+         x="163.35239"
+         xml:space="preserve"> </text>
+      <path
+         id="path5988"
+         d="m 94.745133,16.993315 0,157.619565"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5990"
+         d="m 94.145125,10.616133 c -1.950029,0 -3.525052,1.584917 -3.525052,3.535585 0,1.950667 1.575023,3.535585 3.525052,3.535585 1.959403,0 3.534426,-1.584918 3.534426,-3.535585 0,-1.950668 -1.575023,-3.535585 -3.534426,-3.535585"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5992"
+         d="m 94.145125,10.616133 c -1.950029,0 -3.525052,1.584917 -3.525052,3.535585 0,1.950667 1.575023,3.535585 3.525052,3.535585 1.959403,0 3.534426,-1.584918 3.534426,-3.535585 0,-1.950668 -1.575023,-3.535585 -3.534426,-3.535585"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5994"
+         d="m 94.52013,171.98698 c -1.950028,0 -3.525051,1.58492 -3.525051,3.53559 0,1.95066 1.575023,3.5262 3.525051,3.5262 1.959404,0 3.534427,-1.57554 3.534427,-3.5262 0,-1.95067 -1.575023,-3.53559 -3.534427,-3.53559"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5996"
+         d="m 94.52013,171.98698 c -1.950028,0 -3.525051,1.58492 -3.525051,3.53559 0,1.95066 1.575023,3.5262 3.525051,3.5262 1.959404,0 3.534427,-1.57554 3.534427,-3.5262 0,-1.95067 -1.575023,-3.53559 -3.534427,-3.53559"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5998"
+         d="M 31.491085,109.48122 188.99338,109.07795"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6000"
+         d="m 25.181618,110.16582 c 0,1.96943 1.584398,3.55435 3.534426,3.55435 1.950029,-0.009 3.534427,-1.60368 3.525052,-3.5731 0,-1.96943 -1.584398,-3.56372 -3.534427,-3.55434 -1.959403,0 -3.534426,1.60367 -3.525051,3.57309"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6002"
+         d="m 25.181618,110.16582 c 0,1.96943 1.584398,3.55435 3.534426,3.55435 1.950029,-0.009 3.534427,-1.60368 3.525052,-3.5731 0,-1.96943 -1.584398,-3.56372 -3.534427,-3.55434 -1.959403,0 -3.534426,1.60367 -3.525051,3.57309"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6004"
+         d="m 186.36835,109.34992 c 0.009,1.96942 1.59377,3.56372 3.5438,3.55434 1.95003,0 3.52505,-1.60367 3.51567,-3.5731 0,-1.96942 -1.58439,-3.55434 -3.53442,-3.55434 -1.95003,0.009 -3.52505,1.60368 -3.52505,3.5731"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6006"
+         d="m 186.36835,109.34992 c 0.009,1.96942 1.59377,3.56372 3.5438,3.55434 1.95003,0 3.52505,-1.60367 3.51567,-3.5731 0,-1.96942 -1.58439,-3.55434 -3.53442,-3.55434 -1.95003,0.009 -3.52505,1.60368 -3.52505,3.5731"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 70.297635,8.9723282 0,153.3086718"
+       id="path6038"
+       inkscape:connector-curvature="0"
+       transform="translate(379.68462,739.20433)" />
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image011.svg

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="187.048"
+   height="184.22337"
+   id="svg6570"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 24">
+  <defs
+     id="defs6572">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6583"
+         height="189.81496"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6586"
+         height="16.055494"
+         width="26.550388"
+         y="110.13769"
+         x="111.30163" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6589"
+         height="15.905443"
+         width="26.70039"
+         y="148.85094"
+         x="77.101128" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath4"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6592"
+         height="15.905443"
+         width="26.70039"
+         y="86.579628"
+         x="47.100689" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath5"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6595"
+         height="15.755392"
+         width="26.550388"
+         y="86.279526"
+         x="151.80222" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath6"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect6598"
+         height="15.905443"
+         width="26.70039"
+         y="32.561142"
+         x="71.851051" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.817206"
+     inkscape:cx="35.662879"
+     inkscape:cy="92.112538"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1132"
+     inkscape:window-height="778"
+     inkscape:window-x="110"
+     inkscape:window-y="110"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata6575">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(76.37877,-320.25135)">
+    <g
+       id="g6600"
+       transform="translate(-108.03395,314.65977)">
+      <text
+         id="text6602"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="189.81496"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path6604"
+         d="m 111.24537,110.15645 0,15.99922 26.62539,0 0,-15.99922 -26.62539,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text6606"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8417"
+         x="114.60167"
+         xml:space="preserve">Vn</text>
+      <text
+         id="text6608"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="123.79236"
+         x="130.50191"
+         xml:space="preserve">1</text>
+      <text
+         id="text6610"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8417"
+         x="134.70197"
+         xml:space="preserve"> </text>
+      <path
+         id="path6612"
+         d="m 77.119876,148.85094 0,15.88668 26.625384,0 0,-15.88668 -26.625384,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text6614"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="160.55495"
+         x="82.201202"
+         xml:space="preserve">E</text>
+      <text
+         id="text6616"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="162.50562"
+         x="90.451324"
+         xml:space="preserve">21</text>
+      <text
+         id="text6618"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="160.55495"
+         x="98.701439"
+         xml:space="preserve"> </text>
+      <path
+         id="path6620"
+         d="m 47.119438,86.523359 0,15.942961 26.625389,0 0,-15.942961 -26.625389,0 z"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text6622"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.28363"
+         x="52.200764"
+         xml:space="preserve">E</text>
+      <text
+         id="text6624"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="100.2343"
+         x="60.450882"
+         xml:space="preserve">11</text>
+      <text
+         id="text6626"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.28363"
+         x="68.701004"
+         xml:space="preserve"> </text>
+      <path
+         id="path6628"
+         d="m 151.74597,86.148231 0,15.877309 26.62538,0 0,-15.877309 -26.62538,0 z"
+         clip-path="url(#clipEmfPath4)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text6630"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.133583"
+         x="156.90228"
+         xml:space="preserve">E</text>
+      <text
+         id="text6632"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="100.08425"
+         x="165.1524"
+         xml:space="preserve">12</text>
+      <text
+         id="text6634"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.133583"
+         x="173.40253"
+         xml:space="preserve"> </text>
+      <path
+         id="path6636"
+         d="m 71.869799,32.504874 0,15.942955 26.625389,0 0,-15.942955 -26.625389,0 z"
+         clip-path="url(#clipEmfPath5)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text6638"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.265148"
+         x="76.951126"
+         xml:space="preserve">E</text>
+      <text
+         id="text6640"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.215816"
+         x="85.201241"
+         xml:space="preserve">22</text>
+      <text
+         id="text6642"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.265148"
+         x="93.451363"
+         xml:space="preserve"> </text>
+      <path
+         id="path6644"
+         d="m 102.62025,13.373326 0,157.553914"
+         clip-path="url(#clipEmfPath6)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6646"
+         d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6648"
+         d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6650"
+         d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6652"
+         d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6654"
+         d="m 39.3662,105.9175 157.5023,-0.40327"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6656"
+         d="m 33.056733,106.53646 c 0,1.93191 1.584398,3.49807 3.534426,3.48869 1.950029,0 3.534427,-1.57554 3.525052,-3.50745 0,-1.93191 -1.584398,-3.49807 -3.534427,-3.48869 -1.959403,0 -3.534426,1.57554 -3.525051,3.50745"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6658"
+         d="m 33.056733,106.53646 c 0,1.93191 1.584398,3.49807 3.534426,3.48869 1.950029,0 3.534427,-1.57554 3.525052,-3.50745 0,-1.93191 -1.584398,-3.49807 -3.534427,-3.48869 -1.959403,0 -3.534426,1.57554 -3.525051,3.50745"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6660"
+         d="m 194.24346,105.72055 c 0.009,1.94129 1.59377,3.49808 3.5438,3.49808 1.95003,-0.009 3.52505,-1.57554 3.51568,-3.50745 0,-1.94129 -1.5844,-3.49808 -3.53443,-3.49808 -1.95003,0.009 -3.52505,1.57554 -3.52505,3.50745"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6662"
+         d="m 194.24346,105.72055 c 0.009,1.94129 1.59377,3.49808 3.5438,3.49808 1.95003,-0.009 3.52505,-1.57554 3.51568,-3.50745 0,-1.94129 -1.5844,-3.49808 -3.53443,-3.49808 -1.95003,0.009 -3.52505,1.57554 -3.52505,3.50745"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6664"
+         d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6666"
+         d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m -5.7414067,329.12368 0,86.61064"
+       id="path6720"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -6.096368,423.89843 0.354961,59.98852"
+       id="path6722"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image012.svg

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="187.048"
+   height="75.616943"
+   id="svg7232"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 27">
+  <defs
+     id="defs7234">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7245"
+         height="165.50787"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7248"
+         height="16.055614"
+         width="26.550388"
+         y="110.13851"
+         x="111.30163" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7251"
+         height="15.905562"
+         width="26.70039"
+         y="86.580276"
+         x="47.100689" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath4"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7254"
+         height="15.755509"
+         width="26.550388"
+         y="86.280167"
+         x="151.80222" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.9400647"
+     inkscape:cx="52.151745"
+     inkscape:cy="37.80847"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="901"
+     inkscape:window-height="660"
+     inkscape:window-x="176"
+     inkscape:window-y="176"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7237">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(42.093052,-363.12514)">
+    <g
+       id="g7256"
+       transform="translate(-73.748232,273.23421)">
+      <text
+         id="text7258"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="165.50787"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path7260"
+         d="m 111.24537,110.15727 0,16.06499 26.62539,0 0,-16.06499 -26.62539,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7262"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8426"
+         x="114.60167"
+         xml:space="preserve">Vn</text>
+      <text
+         id="text7264"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="123.79329"
+         x="130.50191"
+         xml:space="preserve">1</text>
+      <text
+         id="text7266"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8426"
+         x="134.70197"
+         xml:space="preserve"> </text>
+      <path
+         id="path7268"
+         d="m 47.119438,86.524005 0,15.943075 26.625389,0 0,-15.943075 -26.625389,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7270"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.28437"
+         x="52.200764"
+         xml:space="preserve">E</text>
+      <text
+         id="text7272"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="100.23505"
+         x="60.450882"
+         xml:space="preserve">11</text>
+      <text
+         id="text7274"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.28437"
+         x="68.701004"
+         xml:space="preserve"> </text>
+      <path
+         id="path7276"
+         d="m 151.74597,86.148874 0,15.877426 26.62538,0 0,-15.877426 -26.62538,0 z"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7278"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.134315"
+         x="156.90228"
+         xml:space="preserve">E</text>
+      <text
+         id="text7280"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="100.085"
+         x="165.1524"
+         xml:space="preserve">12</text>
+      <text
+         id="text7282"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="98.134315"
+         x="173.40253"
+         xml:space="preserve"> </text>
+      <path
+         id="path7284"
+         d="m 39.3662,105.97456 157.5023,-0.39389"
+         clip-path="url(#clipEmfPath4)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7286"
+         d="m 33.056733,106.56539 c 0,1.95068 1.584398,3.53561 3.534426,3.52623 1.950029,0 3.534427,-1.58493 3.525052,-3.53561 0,-1.96006 -1.584398,-3.53561 -3.534427,-3.52623 -1.959403,0 -3.534426,1.58493 -3.525051,3.53561"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7288"
+         d="m 33.056733,106.56539 c 0,1.95068 1.584398,3.53561 3.534426,3.52623 1.950029,0 3.534427,-1.58493 3.525052,-3.53561 0,-1.96006 -1.584398,-3.53561 -3.534427,-3.52623 -1.959403,0 -3.534426,1.58493 -3.525051,3.53561"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7290"
+         d="m 194.24346,105.75886 c 0.009,1.95068 1.59377,3.52623 3.5438,3.51685 1.95003,0 3.52505,-1.58493 3.51568,-3.53561 0,-1.95068 -1.5844,-3.52623 -3.53443,-3.52623 -1.95003,0.009 -3.52505,1.5943 -3.52505,3.54499"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7292"
+         d="m 194.24346,105.75886 c 0.009,1.95068 1.59377,3.52623 3.5438,3.51685 1.95003,0 3.52505,-1.58493 3.51568,-3.53561 0,-1.95068 -1.5844,-3.52623 -3.53443,-3.52623 -1.95003,0.009 -3.52505,1.5943 -3.52505,3.54499"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7294"
+         d="m 102.46087,101.58552 c -1.95003,0 -3.534426,1.58493 -3.534426,3.53561 0,1.95069 1.584396,3.53561 3.534426,3.53561 1.95003,0 3.53443,-1.58492 3.53443,-3.53561 0,-1.95068 -1.5844,-3.53561 -3.53443,-3.53561"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7296"
+         d="m 102.46087,101.58552 c -1.95003,0 -3.534426,1.58493 -3.534426,3.53561 0,1.95069 1.584396,3.53561 3.534426,3.53561 1.95003,0 3.53443,-1.58492 3.53443,-3.53561 0,-1.95068 -1.5844,-3.53561 -3.53443,-3.53561"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 8.121694,16.480859 67.257779,15.973253"
+       id="path7331"
+       inkscape:connector-curvature="0"
+       transform="translate(-42.093052,363.12514)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 74.110458,15.71945 162.43388,14.958041"
+       id="path7333"
+       inkscape:connector-curvature="0"
+       transform="translate(-42.093052,363.12514)" />
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image013.svg

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="141.50281"
+   height="184.22337"
+   id="svg7843"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 30">
+  <defs
+     id="defs7845">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7856"
+         height="189.81496"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7859"
+         height="16.055494"
+         width="26.550388"
+         y="110.13769"
+         x="111.30163" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7862"
+         height="15.905443"
+         width="26.70039"
+         y="148.85094"
+         x="77.101128" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath4"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect7865"
+         height="15.905443"
+         width="26.70039"
+         y="32.561142"
+         x="71.851051" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.3178168"
+     inkscape:cx="0.42660899"
+     inkscape:cy="92.112538"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="902"
+     inkscape:window-height="840"
+     inkscape:window-x="223"
+     inkscape:window-y="76"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7848">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-43.534308,-323.10849)">
+    <g
+       id="g7867"
+       transform="translate(-33.666065,317.51691)">
+      <text
+         id="text7869"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="189.81496"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path7871"
+         d="m 111.30163,110.15645 0,15.99922 26.62538,0 0,-15.99922 -26.62538,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7873"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8417"
+         x="114.60167"
+         xml:space="preserve">Vn</text>
+      <text
+         id="text7875"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="123.79236"
+         x="130.50191"
+         xml:space="preserve">1</text>
+      <text
+         id="text7877"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="121.8417"
+         x="134.70197"
+         xml:space="preserve"> </text>
+      <path
+         id="path7879"
+         d="m 77.119876,148.85094 0,15.88668 26.625384,0 0,-15.88668 -26.625384,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7881"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="160.55495"
+         x="82.201202"
+         xml:space="preserve">E</text>
+      <text
+         id="text7883"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="162.50562"
+         x="90.451324"
+         xml:space="preserve">21</text>
+      <text
+         id="text7885"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="160.55495"
+         x="98.701439"
+         xml:space="preserve"> </text>
+      <path
+         id="path7887"
+         d="m 71.869799,32.504874 0,15.942955 26.625389,0 0,-15.942955 -26.625389,0 z"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text7889"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.265148"
+         x="76.951126"
+         xml:space="preserve">E</text>
+      <text
+         id="text7891"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.215816"
+         x="85.201241"
+         xml:space="preserve">22</text>
+      <text
+         id="text7893"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.265148"
+         x="93.451363"
+         xml:space="preserve"> </text>
+      <path
+         id="path7895"
+         d="m 102.62025,13.373326 0,157.553914"
+         clip-path="url(#clipEmfPath4)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7897"
+         d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7899"
+         d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7901"
+         d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7903"
+         d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7905"
+         d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7907"
+         d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 25.023548,8.6271 0,86.288095"
+       id="path7946"
+       inkscape:connector-curvature="0"
+       transform="translate(43.534308,323.10849)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 25.454988,104.40689 0,57.38158"
+       id="path7948"
+       inkscape:connector-curvature="0"
+       transform="translate(43.534308,323.10849)" />
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image014.svg

@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="204.41466"
+   height="137.59633"
+   id="svg8458"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 33">
+  <defs
+     id="defs8460">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect8471"
+         height="169.12204"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect8474"
+         height="15.742743"
+         width="26.70039"
+         y="140.93503"
+         x="159.60233" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect8477"
+         height="15.892674"
+         width="26.550388"
+         y="32.834866"
+         x="39.450577" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.5176879"
+     inkscape:cx="102.20076"
+     inkscape:cy="68.79519"
+     inkscape:document-units="px"
+     inkscape:current-layer="g8479"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1015"
+     inkscape:window-height="672"
+     inkscape:window-x="44"
+     inkscape:window-y="44"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata8463">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(70.772185,-349.27533)">
+    <g
+       id="g8479"
+       transform="translate(-84.492153,318.18383)">
+      <text
+         id="text8481"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="168.97211"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path8483"
+         d="m 159.55545,140.80384 0,15.93016 26.69102,0 0,-15.93016 -26.69102,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text8485"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="152.77957"
+         x="166.65244"
+         xml:space="preserve">E</text>
+      <text
+         id="text8487"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="154.72867"
+         x="174.90256"
+         xml:space="preserve">2</text>
+      <text
+         id="text8489"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="152.77957"
+         x="179.10262"
+         xml:space="preserve"> </text>
+      <path
+         id="path8491"
+         d="m 39.431826,32.788011 0,15.864562 26.625388,0 0,-15.864562 -26.625388,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text8493"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.529472"
+         x="46.500679"
+         xml:space="preserve">E</text>
+      <text
+         id="text8495"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.478577"
+         x="54.750797"
+         xml:space="preserve">1</text>
+      <text
+         id="text8497"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.529472"
+         x="58.950863"
+         xml:space="preserve"> </text>
+      <path
+         id="path8499"
+         d="M 153.30224,120.70373 19.865915,36.957963"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8501"
+         d="m 159.0117,123.5899 c 1.04064,-1.64924 0.54375,-3.82323 -1.10627,-4.86338 -1.65002,-1.03077 -3.83443,-0.53413 -4.87507,1.11511 -1.03127,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65002,1.04015 3.83443,0.5435 4.8657,-1.11511"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8503"
+         d="m 160.71736,119.32574 c 1.04064,-1.64924 0.54375,-3.82323 -1.10627,-4.86338 -1.65002,-1.03077 -3.83443,-0.53413 -4.87507,1.11511 -1.03127,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65002,1.04015 3.83443,0.5435 4.8657,-1.11511"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8505"
+         d="m 22.200324,38.194893 c 1.04064,-1.649239 0.543758,-3.832608 -1.115641,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650024,1.030775 3.834431,0.534129 4.865696,-1.115111"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8507"
+         d="m 22.200324,38.194893 c 1.04064,-1.649239 0.543758,-3.832608 -1.115641,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650024,1.030775 3.834431,0.534129 4.865696,-1.115111"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8509"
+         d="M 198.14946,149.63913 61.644959,70.993542"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8511"
+         d="m 202.32483,155.07539 c 1.04064,-1.64924 0.54376,-3.82324 -1.10627,-4.86338 -1.65002,-1.03078 -3.83443,-0.53413 -4.87507,1.11511 -1.03126,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65003,1.04015 3.83443,0.5435 4.8657,-1.11511"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8513"
+         d="m 204.88333,153.93828 c 1.04064,-1.64924 0.54376,-3.82324 -1.10627,-4.86338 -1.65002,-1.03078 -3.83443,-0.53413 -4.87507,1.11511 -1.03126,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65003,1.04015 3.83443,0.5435 4.8657,-1.11511"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8515"
+         d="m 65.513457,69.680379 c 1.04064,-1.649239 0.543757,-3.832608 -1.115642,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650025,1.030775 3.834431,0.534129 4.865697,-1.115111"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8517"
+         d="m 62.670681,70.533212 c 1.04064,-1.649239 0.543757,-3.832608 -1.115642,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650025,1.030775 3.834431,0.534129 4.865697,-1.115111"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M -63.096689,357.24106 69.31399,433.6884"
+       id="path8549"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

dox/user_guides/boolean_operations/images/boolean_image015.svg

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="204.66461"
+   height="131.16034"
+   id="svg9059"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 36">
+  <defs
+     id="defs9061">
+    <clipPath
+       id="clipEmfPath1"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect9072"
+         height="162.56694"
+         width="566.85828"
+         y="0"
+         x="0" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath2"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect9075"
+         height="15.746798"
+         width="26.70039"
+         y="74.08493"
+         x="98.85144" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect9078"
+         height="15.746798"
+         width="26.70039"
+         y="140.97133"
+         x="159.30232" />
+    </clipPath>
+    <clipPath
+       id="clipEmfPath4"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         id="rect9081"
+         height="15.896767"
+         width="26.550388"
+         y="32.843323"
+         x="39.300575" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.1865399"
+     inkscape:cx="91.411912"
+     inkscape:cy="65.588382"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="861"
+     inkscape:window-height="606"
+     inkscape:window-x="110"
+     inkscape:window-y="110"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata9064">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(56.60986,-329.64737)">
+    <g
+       id="g9083"
+       transform="translate(-70.64843,298.24077)">
+      <text
+         id="text9085"
+         style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="162.56694"
+         x="218.70319"
+         xml:space="preserve"> </text>
+      <path
+         id="path9087"
+         d="m 98.870194,73.972457 0,15.878021 26.625386,0 0,-15.878021 -26.625386,0 z"
+         clip-path="url(#clipEmfPath1)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text9089"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="85.932526"
+         x="103.95152"
+         xml:space="preserve">E</text>
+      <text
+         id="text9091"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="87.882126"
+         x="112.20164"
+         xml:space="preserve">12</text>
+      <text
+         id="text9093"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="85.932526"
+         x="120.45176"
+         xml:space="preserve"> </text>
+      <path
+         id="path9095"
+         d="m 159.30233,140.84011 0,15.93426 26.69101,0 0,-15.93426 -26.69101,0 z"
+         clip-path="url(#clipEmfPath2)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text9097"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="152.81892"
+         x="164.4024"
+         xml:space="preserve">E</text>
+      <text
+         id="text9099"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="154.76852"
+         x="172.65253"
+         xml:space="preserve">22</text>
+      <text
+         id="text9101"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="152.81892"
+         x="180.90263"
+         xml:space="preserve"> </text>
+      <path
+         id="path9103"
+         d="m 39.178697,32.796455 0,15.868648 26.625389,0 0,-15.868648 -26.625389,0 z"
+         clip-path="url(#clipEmfPath3)"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <text
+         id="text9105"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.540943"
+         x="44.400646"
+         xml:space="preserve">E</text>
+      <text
+         id="text9107"
+         style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="46.490547"
+         x="52.650768"
+         xml:space="preserve">11</text>
+      <text
+         id="text9109"
+         style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
+         y="44.540943"
+         x="60.90089"
+         xml:space="preserve"> </text>
+      <path
+         id="path9111"
+         d="M 196.93413,148.29172 63.488427,64.524378"
+         clip-path="url(#clipEmfPath4)"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9113"
+         d="m 202.64358,151.17863 c 1.03127,-1.64966 0.53439,-3.82422 -1.11564,-4.86463 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.11539 -1.04064,1.64967 -0.54376,3.8336 1.11564,4.86464 1.65002,1.04041 3.82505,0.54364 4.86569,-1.1154"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9115"
+         d="m 202.64358,151.17863 c 1.03127,-1.64966 0.53439,-3.82422 -1.11564,-4.86463 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.11539 -1.04064,1.64967 -0.54376,3.8336 1.11564,4.86464 1.65002,1.04041 3.82505,0.54364 4.86569,-1.1154"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9117"
+         d="m 65.822836,65.761627 c 1.04064,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.543639 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9119"
+         d="m 65.822836,65.761627 c 1.04064,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.543639 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9121"
+         d="M 153.05848,120.73482 19.612786,36.967482"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9123"
+         d="m 158.76794,123.62174 c 1.03127,-1.64967 0.53439,-3.82423 -1.11564,-4.86464 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.1154 -1.04064,1.64966 -0.54376,3.83359 1.11564,4.86463 1.65002,1.04042 3.82505,0.54364 4.86569,-1.11539"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9125"
+         d="m 158.76794,123.62174 c 1.03127,-1.64967 0.53439,-3.82423 -1.11564,-4.86464 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.1154 -1.04064,1.64966 -0.54376,3.83359 1.11564,4.86463 1.65002,1.04042 3.82505,0.54364 4.86569,-1.11539"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9127"
+         d="m 21.947195,38.204731 c 1.040641,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.54364 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9129"
+         d="m 21.947195,38.204731 c 1.040641,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.54364 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9131"
+         d="m 59.307116,63.9245 c 0,1.96835 1.584398,3.561776 3.534427,3.552403 1.950028,0 3.534426,-1.602799 3.525051,-3.571149 0,-1.96835 -1.584398,-3.552402 -3.534427,-3.552402 -1.959403,0.0094 -3.534426,1.602799 -3.525051,3.571148"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9133"
+         d="m 59.307116,63.9245 c 0,1.96835 1.584398,3.561776 3.534427,3.552403 1.950028,0 3.534426,-1.602799 3.525051,-3.571149 0,-1.96835 -1.584398,-3.552402 -3.534427,-3.552402 -1.959403,0.0094 -3.534426,1.602799 -3.525051,3.571148"
+         style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 144.67103,92.560478 37.97222,22.908862"
+       id="path9173"
+       inkscape:connector-curvature="0"
+       transform="translate(-56.60986,329.64737)" />
+  </g>
+</svg>