Update version up to 7.5.3

Modify method IntWalk_IWalking::ComputeCloseLine: add new flag "isOnDegeneratedBorder" to reach the border successfully.

.gitignore

@@ -12,12 +12,6 @@
 win32
 win64
 
-# standard names of directories for objects and binaries for samples
-bin
-obj
-Debug
-Release
-
 # project files and artifacts
 /adm/msvc
 /adm/wnt

CMakeLists.txt

@@ -86,6 +86,11 @@ if (BUILD_WITH_DEBUG)
   set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
 endif()
 
+# option disabling OCCT exceptions in Release builds (No_Exception)
+if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
+  set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
+endif()
+
 # option to enable or disable use of precompiled headers
 if (NOT DEFINED BUILD_USE_PCH)
   set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
@@ -96,7 +101,7 @@ if (BUILD_USE_PCH)
   # Load Cotire tool for accelerating build procedure
   include(cotire)
 
-  # Set Cotire to ignore lxx, pxx, gxx 
+  # Set Cotire to ignore lxx, pxx, gxx
   set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS "lxx;pxx;gxx" CACHE STRING "Set Cotire to ignore OCCT specific files that can be #included" FORCE)
 
   # Set priority for inclusion of system headers in PCH to reduce problems
@@ -160,7 +165,7 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX_PREV)
 elseif (NOT "${CMAKE_INSTALL_PREFIX_PREV}" STREQUAL "${CMAKE_INSTALL_PREFIX}")
   # CMAKE_INSTALL_PREFIX has been changed at previous step
   set (CMAKE_INSTALL_PREFIX_PREV "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
-  
+
   # INSTALL_DIR is required to be updated
   set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}" FORCE)
 endif()
@@ -172,10 +177,10 @@ elseif (NOT "${INSTALL_DIR_PREV}" STREQUAL "${INSTALL_DIR}")
   # INSTALL_DIR has been changed at previous step
   set (INSTALL_DIR_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
 
-  # sync CMAKE_INSTALL_PREFIX with INSTALL_DIR 
+  # sync CMAKE_INSTALL_PREFIX with INSTALL_DIR
   set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
 
-  # set CMAKE_INSTALL_PREFIX_PREV to avoid the reset of structure of the install folder 
+  # set CMAKE_INSTALL_PREFIX_PREV to avoid the reset of structure of the install folder
   set (CMAKE_INSTALL_PREFIX_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
 endif()
 
@@ -401,7 +406,7 @@ if (NOT DEFINED BUILD_DOC_Overview)
   set (DO_ONLY_CHECK_FOR_DOXYGEN ON)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
   set (DO_ONLY_CHECK_FOR_DOXYGEN OFF)
-  
+
   if (CAN_DOXYGEN_BE_USED)
     message (STATUS "Info. Overview building is turned on")
   endif()
@@ -490,7 +495,7 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
 if (USE_TCL)
   message (STATUS "Info: TCL is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
-  
+
   message (STATUS "Info: TK is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tk")
 else()
@@ -518,7 +523,7 @@ if (USE_VTK)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
-  
+
   if (NOT CAN_USE_VTK EQUAL -1)
     message (STATUS "Info: TKIVtk and TKIVtkDraw toolkits excluded due to VTK usage is disabled")
 
@@ -560,6 +565,26 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
 endif()
 
+# OpenVR
+# search for CSF_OpenVR variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED (CSF_OpenVR CAN_USE_OPENVR)
+if (CAN_USE_OPENVR)
+  set (USE_OPENVR OFF CACHE BOOL "${USE_OPENVR_DESCR}")
+
+  if (USE_OPENVR)
+    add_definitions (-DHAVE_OPENVR)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/openvr")
+  else()
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENVR")
+    OCCT_CHECK_AND_UNSET ("INSTALL_OPENVR")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_OPENVR")
+
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENVR")
+  OCCT_CHECK_AND_UNSET ("INSTALL_OPENVR")
+endif()
+
 # FFmpeg
 # search for CSF_FFmpeg variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_FFmpeg CAN_USE_FFMPEG)
@@ -628,6 +653,26 @@ else()
   OCCT_CHECK_AND_UNSET ("INSTALL_TBB")
 endif()
 
+# RapidJSON
+# search for CSF_RapidJSON variable in EXTERNLIB of each being used toolkit
+OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
+if (CAN_USE_RAPIDJSON)
+  set (USE_RAPIDJSON OFF CACHE BOOL "${USE_RAPIDJSON_DESCR}")
+
+  if (USE_RAPIDJSON)
+    add_definitions (-DHAVE_RAPIDJSON)
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
+  else()
+    OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+    OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+  endif()
+else()
+  OCCT_CHECK_AND_UNSET ("USE_RAPIDJSON")
+
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
+  OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
+endif()
+
 # EIGEN
 if (CAN_USE_EIGEN)
   set (USE_EIGEN OFF CACHE BOOL "${USE_EIGEN_DESCR}")
@@ -669,20 +714,32 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()
 
-# bison 
+# bison
 if (BUILD_YACCLEX)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
 else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_BISON_EXECUTABLE")
 endif()
 
-# flex 
+# flex
 if (BUILD_YACCLEX)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/flex")
 else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_FLEX_EXECUTABLE")
 endif()
 
+# qt for inspector and samples
+if (BUILD_Inspector OR BUILD_SAMPLES_QT)
+  # check qt 3rdparty path
+  add_definitions (-DHAVE_QT)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
+  message (STATUS "Info: Qt is used by OCCT")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
+  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
+endif()
+
 # check all 3rdparty include paths
 string (REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
 if (3RDPARTY_NOT_INCLUDED)
@@ -743,7 +800,7 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
 
-if (WIN32) 
+if (WIN32)
   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
   set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
@@ -770,17 +827,6 @@ else()
   set (SCRIPT_EXT sh)
 endif()
 
-if (BUILD_Inspector OR BUILD_SAMPLES_QT)
-  # check qt 3rdparty path
-  add_definitions (-DHAVE_QT)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/qt")
-  message (STATUS "Info: Qt is used by OCCT")
-else()
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_QT")
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TQTMALLOC")
-  OCCT_CHECK_AND_UNSET ("INSTALL_QT")
-endif()
-
 # OCCT tools
 # include the patched or original list of tools
 # list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
@@ -823,9 +869,11 @@ if (INSTALL_SAMPLES)
   OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code" "${INSTALL_DIR_SAMPLES}/OCCTOverview")
 
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/OCCTOverview" RENAME "env.${SCRIPT_EXT}")
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/Tutorial" RENAME "env.${SCRIPT_EXT}")
 endif()
 
@@ -904,6 +952,9 @@ if (WIN32)
   OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
   # install env script
   install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
+  # copy build.bat and install.bat scripts to CMake binary folder
+  OCCT_COPY_FILE_OR_DIR ("adm/templates/build.bat" "${CMAKE_BINARY_DIR}")
+  OCCT_COPY_FILE_OR_DIR ("adm/templates/install.bat" "${CMAKE_BINARY_DIR}")
 else()
   set (SUB_ENV_NAME "env.${SCRIPT_EXT}")
   set (SUB_ENV_BUILD_NAME "env.install.${SCRIPT_EXT}")
@@ -936,6 +987,15 @@ if (BUILD_SAMPLES_QT)
     OCCT_INSTALL_FILE_OR_DIR ("samples/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/samples")
     #message("Copy Sample resources: samples/${RESOURCE} into ${INSTALL_DIR_RESOURCE}/samples")
   endforeach()
+
+  ## Copy sources of OCCTOverview for using in the sample
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
 endif()
 
 
@@ -1153,7 +1213,7 @@ foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED})
   install(EXPORT OpenCASCADE${OCCT_MODULE}Targets DESTINATION "${INSTALL_DIR_CMAKE}")
 endforeach()
 
-# Update generated OpenCASCADETargets-*.cmake files 
+# Update generated OpenCASCADETargets-*.cmake files
 # to have correct paths to libraries depending on the configuration
 OCCT_UPDATE_TARGET_FILE ()
 

adm/.gitignore

@@ -0,0 +1 @@
+/build-*

adm/MODULES

@@ -3,5 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
+DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
 Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE

adm/RESOURCES

@@ -3,6 +3,7 @@ StdResource
 SHMessage
 Textures
 Shaders
+XRResources
 XSMessage
 XSTEPResource
 XmlOcafResource

adm/SAMPLES

@@ -1 +1 @@
-qt AndroidQt FuncDemo IESample Tutorial
+qt AndroidQt FuncDemo IESample Tutorial OCCTOverview

adm/SAMPLES_RESOURCES

@@ -1,2 +1,3 @@
 qt/Common/res/
-qt/Tutorial/res/
+qt/Tutorial/res/
+qt/OCCTOverview/res/

adm/UDLIST

@@ -108,6 +108,7 @@ n BRepMesh
 n BRepMeshData
 n BRepOffset
 n BRepOffsetAPI
+n BRepPreviewAPI
 n BRepPrim
 n BRepPrimAPI
 n BRepProj
@@ -201,8 +202,10 @@ n InterfaceGraphic
 n AIS
 n Aspect
 n DsgPrs
+n PrsDim
 n Graphic3d
 n Image
+n Media
 n MeshVS
 n OpenGl
 n D3DHost
@@ -213,13 +216,13 @@ n SelectBasics
 n SelectMgr
 n StdPrs
 n StdSelect
-n TColQuantity
 n V3d
 n WNT
 n Xw
 n Cocoa
 r Textures
 r Shaders
+r XRResources
 t TKMeshVS
 t TKOpenGl
 t TKD3DHost
@@ -438,3 +441,27 @@ n Geom2dEvaluator
 t TKVCAF
 n XCAFView
 n XCAFNoteObjects
+t TKRWMesh
+n RWGltf
+n RWMesh
+n RWObj
+n DFBrowser
+n DFBrowserPane
+n DFBrowserPaneXDE
+n ShapeView
+n TInspector
+n TInspectorAPI
+x TInspectorEXE
+t TKDFBrowser
+t TKShapeView
+t TKTInspector
+t TKTInspectorAPI
+t TKToolsDraw
+t TKTreeModel
+t TKView
+t TKVInspector
+n ToolsDraw
+n TreeModel
+n View
+n ViewControl
+n VInspector

adm/cmake/3rdparty_macro.cmake

@@ -97,12 +97,12 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
     if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
       find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
                                                       PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
-                                                      PATH_SUFFIXES include inc
+                                                      PATH_SUFFIXES include inc headers
                                                       CMAKE_FIND_ROOT_PATH_BOTH
                                                       NO_DEFAULT_PATH)
     else()
       find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATH_SUFFIXES include inc
+                                                      PATH_SUFFIXES include inc headers
                                                       CMAKE_FIND_ROOT_PATH_BOTH)
     endif()
   endif()
@@ -125,15 +125,19 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
         if (WIN32)
           set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
         endif()
         if (ANDROID)
           set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
         endif()
+        if(UNIX AND NOT APPLE AND NOT ANDROID)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
+        endif()
 
         # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
         set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
 
-        if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
           find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
                                                                                 PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
                                                                                 PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
@@ -181,10 +185,10 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
           # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
           set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
 
-          if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
             find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                               PATH_SUFFIXES bin  win${COMPILER_BITNESS}/${COMPILER}/bin
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
                                                                                NO_DEFAULT_PATH)
             if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
               # find directory recursive
@@ -238,6 +242,7 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
       if (INSTALL_${PRODUCT_NAME})
         OCCT_MAKE_OS_WITH_BITNESS()
         OCCT_MAKE_COMPILER_SHORT_NAME()
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
 
         if (WIN32)
           if (SINGLE_GENERATOR)
@@ -280,14 +285,17 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
         endif()
       else()
         # the library directory for using by the executable
-      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
           if (WIN32)
             set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
           else()
             set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
           endif()
         endforeach()
+        if (WIN32)
+          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+        endif()
       endif()
 
       mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})

adm/cmake/bison.cmake

@@ -2,19 +2,26 @@
 
 # execute FindBISON script by "find_package (Bison)" is required to define BISON_TARGET macro
 
-if (NOT DEFINED 3RDPARTY_BISON_EXECUTABLE)
-  set (3RDPARTY_BISON_EXECUTABLE "" CACHE FILEPATH "The path to the bison command")
+# delete obsolete 3RDPARTY_BISON_EXECUTABLE cache variable (not used anymore)
+unset (3RDPARTY_BISON_EXECUTABLE CACHE)
+
+# delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# without reasonable diagnostic
+if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
+  unset (BISON_EXECUTABLE CACHE)
 endif()
 
-# BISON_EXECUTABLE is required by BISON_TARGET macro and should be defined
-set (BISON_EXECUTABLE "${3RDPARTY_BISON_EXECUTABLE}" CACHE FILEPATH "path to the bison executable" FORCE)
-
-find_package (BISON)
-
-if (BISON_FOUND)
-  set (3RDPARTY_BISON_EXECUTABLE "${BISON_EXECUTABLE}" CACHE FILEPATH "The Path to the bison command" FORCE)
+# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
+# these paths searhed by find_package
+if (3RDPARTY_DIR)
+  file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
+  foreach (candidate_path ${BISON_PATHS})
+    if (IS_DIRECTORY ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+    endif()
+  endforeach()
 endif()
-
-if (NOT 3RDPARTY_BISON_EXECUTABLE OR NOT EXISTS "${3RDPARTY_BISON_EXECUTABLE}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_BISON_EXECUTABLE)
-endif()
+ 
+# bison 3.2 is required because it provides options to avoid generation of redundant header
+# files and embedding of local paths in the generated code
+find_package (BISON 3.2)

adm/cmake/flex.cmake

@@ -2,19 +2,34 @@
 
 # execute FindFLEX script by "find_package (Flex)" is required to define FLEX_TARGET macro
 
-if (NOT DEFINED 3RDPARTY_FLEX_EXECUTABLE)
-  set (3RDPARTY_FLEX_EXECUTABLE "" CACHE FILEPATH "The Path to the flex command")
+# delete obsolete 3RDPARTY_FLEX_EXECUTABLE cache variable (not used anymore)
+unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
+
+# delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# without reasonable diagnostic
+if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
+  unset (FLEX_EXECUTABLE CACHE)
+endif()
+if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
+  unset (FLEX_INCLUDE_DIR CACHE)
 endif()
 
-# FLEX_EXECUTABLE is required by FLEX_TARGET macro and should be defined
-set (FLEX_EXECUTABLE "${3RDPARTY_FLEX_EXECUTABLE}" CACHE FILEPATH "path to the flex executable" FORCE)
-
-find_package (FLEX)
-
-if (FLEX_FOUND)
-  set (3RDPARTY_FLEX_EXECUTABLE "${FLEX_EXECUTABLE}" CACHE FILEPATH "The Path to the flex command" FORCE)
+# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
+# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
+if (3RDPARTY_DIR)
+  file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
+  foreach (candidate_path ${FLEX_PATHS})
+    if (IS_DIRECTORY ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
+    endif()
+  endforeach()
 endif()
+ 
+# flex 2.5.37 is required because closest known lower version, 2.5.3 from WOK 6.8.0,
+# generates code which is unusable on Windows (includes unistd.h without any way to avoid this)
+find_package (FLEX 2.5.37)
 
-if (NOT 3RDPARTY_FLEX_EXECUTABLE OR NOT EXISTS "${3RDPARTY_FLEX_EXECUTABLE}")
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FLEX_EXECUTABLE)
-endif()
+if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
+endif()

adm/cmake/occt_csf.cmake

@@ -42,6 +42,13 @@ else()
   endif()
 endif()
 
+# OpenVR
+if (USE_OPENVR)
+  set (CSF_OpenVR "openvr_api")
+else()
+  set (CSF_OpenVR)
+endif()
+
 # TCL/TK
 if (USE_TCL)
   if (WIN32)
@@ -65,6 +72,7 @@ if (WIN32)
   set (CSF_shell32       "shell32.lib")
   set (CSF_wsock32       "wsock32.lib")
   set (CSF_psapi         "psapi.lib")
+  set (CSF_winmm         "winmm.lib")
   set (CSF_d3d9          "D3D9.lib")
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
     set (CSF_OpenGlLibs  "libEGL libGLESv2")
@@ -72,34 +80,42 @@ if (WIN32)
     set (CSF_OpenGlLibs  "opengl32.lib")
   endif()
 
-  else()
+else()
 
   if (APPLE)
     set (CSF_objc        "objc")
 
     # frameworks
-    find_library (Appkit_LIB NAMES AppKit)
-    set (CSF_Appkit ${Appkit_LIB})
+    if (IOS)
+      find_library (Appkit_LIB NAMES UIKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    else()
+      find_library (Appkit_LIB NAMES AppKit)
+      set (CSF_Appkit ${Appkit_LIB})
+    endif()
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
 
     find_library (IOKit_LIB NAMES IOKit)
     set (CSF_IOKit ${IOKit_LIB})
-
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
     OCCT_CHECK_AND_UNSET (IOKit_LIB)
 
-    if (USE_GLX)
+    if (IOS)
+      find_library (OpenGlLibs_LIB NAMES OpenGLES)
+      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+    elseif (USE_GLX)
       set (CSF_OpenGlLibs GL)
       set (CSF_XwLibs     "X11 Xext Xmu Xi")
     else()
       find_library (OpenGlLibs_LIB NAMES OpenGL)
       set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-
       OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
     endif()
     
   elseif (ANDROID)
     set (CSF_ThreadLibs  "c")
     set (CSF_OpenGlLibs  "EGL GLESv2")
+    set (CSF_androidlog  "log")
   elseif (UNIX)
     set (CSF_ThreadLibs  "pthread rt stdc++")
     if (USE_GLES2)
@@ -109,5 +125,6 @@ if (WIN32)
     endif()
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
     set (CSF_dl          "dl")
+    set (CSF_fontconfig  "fontconfig")
   endif()
 endif()

adm/cmake/occt_defs_flags.cmake

@@ -111,37 +111,36 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMP
   endif()
 endif()
 
-if(MINGW)
-  # Set default release optimization option to O2 instead of O3, since in
-  # some OCCT related examples, this gives significantly smaller binaries
-  # at comparable performace with MinGW-w64.
-  string (REGEX MATCH "-O3" IS_O3_CXX "${CMAKE_CXX_FLAGS_RELEASE}")
-  if (IS_O3_CXX)
-    string (REGEX REPLACE "-O3" "-O2" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-  else()
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
-  endif()
-
-  set (CMAKE_CXX_FLAGS "-std=gnu++0x ${CMAKE_CXX_FLAGS}")
-  add_definitions(-D_WIN32_WINNT=0x0501)
-  # workaround bugs in mingw with vtable export
-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
-elseif ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
   if (APPLE)
     # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
     set (CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ ${CMAKE_CXX_FLAGS}")
-  else()
+  elseif(NOT WIN32)
+    # CLang for Windows (at least CLang 8.0 distributed with VS 2019)
+    # does not support option "-std=c++0x"
     set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
   endif()
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-  set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
-endif()
+  # Optimize size of binaries
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+elseif(MINGW)
+  add_definitions(-D_WIN32_WINNT=0x0501)
+  # workaround bugs in mingw with vtable export
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
 
-# Optimize size of binaries
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
+  # Require C++11
+  set (CMAKE_CXX_FLAGS "-std=gnu++0x ${CMAKE_CXX_FLAGS}")
+  # Optimize size of binaries
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+  # Require C++11
+  set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+  # Optimize size of binaries
   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
 endif()
 
-set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+endif()

adm/cmake/occt_macros.cmake

@@ -12,18 +12,12 @@ macro (OCCT_CHECK_AND_UNSET VARNAME)
   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")
-
-  if (WIN32)
-    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
-    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
-  endif()
+macro (OCCT_CHECK_AND_UNSET_GROUP GROUPNAME)
+  get_cmake_property(VARS VARIABLES)
+  string (REGEX MATCHALL "(^|;)${GROUPNAME}[A-Za-z0-9_]*" GROUPNAME_VARS "${VARS}")
+  foreach(GROUPNAME_VAR ${GROUPNAME_VARS})
+    OCCT_CHECK_AND_UNSET(${GROUPNAME_VAR})
+  endforeach()
 endmacro()
 
 macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
@@ -163,13 +157,18 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   OCCT_MAKE_COMPILER_BITNESS()
 
   string (TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME)
-
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
-  list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
+  if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
+    string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
+    list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
+  else()
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[a-zA-Z]*[0-9]*-${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*.*${COMPILER_BITNESS}")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+")
+    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*")
+  endif()
 
   SUBDIRECTORY_NAMES ("${ROOT_DIR}" SUBDIR_NAME_LIST)
 
@@ -269,7 +268,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     list (LENGTH OCCT_ALL_FILE_NAMES ALL_FILES_NB)
     math (EXPR ALL_FILES_NB "${ALL_FILES_NB} - 1" )
 
-    # emit warnings if there is unprocessed headers
+    # emit warnings if there are unprocessed headers
     file (GLOB OCCT_ALL_FILES_IN_DIR "${OCCT_COLLECT_SOURCE_DIR}/${OCCT_PACKAGE}/*.*")
     file (GLOB OCCT_ALL_FILES_IN_PATCH_DIR "${BUILD_PATCH}/src/${OCCT_PACKAGE}/*.*")
 
@@ -302,8 +301,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
             list (APPEND OCCT_HEADER_FILES_COMPLETE ${OCCT_FILE_IN_DIR})
 
             # collect header files with name that does not contain its package one
-            string (FIND "${OCCT_FILE_NAME}" "${OCCT_PACKAGE}_" FOUND_INDEX)
-            if (NOT ${FOUND_INDEX} EQUAL 0)
+            string (REGEX MATCH "^${OCCT_PACKAGE}[_.]" IS_HEADER_MATHCING_PACKAGE "${OCCT_FILE_NAME}")
+            if (NOT IS_HEADER_MATHCING_PACKAGE)
               list (APPEND OCCT_HEADER_FILE_WITH_PROPER_NAMES "${OCCT_FILE_NAME}")
             endif()
           endif()
@@ -350,12 +349,12 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     list (FIND OCCT_USED_PACKAGES ${PACKAGE_NAME} IS_HEADER_FOUND)
     if (NOT ${IS_HEADER_FOUND} EQUAL -1)
       if (NOT EXISTS "${OCCT_COLLECT_SOURCE_DIR}/${PACKAGE_NAME}/${HEADER_FILE_NAME}")
-        message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not presented in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
+        message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is not present in the sources and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
         file (REMOVE "${OCCT_HEADER_FILE_OLD}")
       else()
         list (FIND OCCT_HEADER_FILE_NAMES_NOT_IN_FILES ${PACKAGE_NAME} IS_HEADER_FOUND)
         if (NOT ${IS_HEADER_FOUND} EQUAL -1)
-          message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is presented in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
+          message (STATUS "Warning. ${OCCT_HEADER_FILE_OLD} is present in the sources but not involved in FILES and will be removed from ${ROOT_TARGET_OCCT_DIR}/inc")
           file (REMOVE "${OCCT_HEADER_FILE_OLD}")
         endif()
       endif()

adm/cmake/occt_toolkit.cmake

@@ -57,117 +57,140 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
     set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
   endif()
 
-  # TKService contains platform-dependent packages: Xw and WNT
-  if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
-    # do nothing
-  else()
-
-    if (WIN32)
-      list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
-    endif()
-
-    set (SOURCE_FILES)
-    set (HEADER_FILES)
-
-    # Generate Flex and Bison files
-    if (${BUILD_YACCLEX})
-
-      # flex files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
-      list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
-
-      # bison files
-      OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
-      list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
-
-      if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
-      
-        list (SORT SOURCE_FILES_FLEX)
-        list (SORT SOURCE_FILES_BISON)
-
-        math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
-        foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
-
-          list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
-          get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
-
-          list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
-          get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
-          
-          string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
-
-          if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
-            set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
-            set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
-            BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
-            FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
-            ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
-           
-            list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
-          endif()
-        endforeach()
-      endif()
-    endif()
-
-    # header files
-    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
-
-      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
-      if(APPLE)
-        file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
-      endif()
-    else()
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
-
-      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
-      if(APPLE)
-        file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
-      endif()
-    endif()
-    
-    list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
-    list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
-    if(APPLE)
-      list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
-    endif()
-
-    foreach(HEADER_FILE ${HEADER_FILES})
-      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        list (APPEND USED_INCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-      else()
-        list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-        SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
-      endif()
-    endforeach()
-
-    foreach(SOURCE_FILE ${SOURCE_FILES})
-      if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        list (APPEND USED_SRCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-      else()
-        list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-        SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
-      endif()
-    endforeach()
-
-    if (USE_QT)
-      FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
-      #message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
-    endif(USE_QT)
-
-    #message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
-    foreach(RESOURCE_FILE ${RESOURCE_FILES})
-      SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
-    endforeach()
+  if (WIN32)
+    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE_NAME}_DLL")
   endif()
+
+  set (SOURCE_FILES)
+  set (HEADER_FILES)
+
+  # Generate Flex and Bison files
+  if (${BUILD_YACCLEX})
+    # flex files
+    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
+    list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
+
+    # bison files
+    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
+    list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
+
+    if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
+      
+      list (SORT SOURCE_FILES_FLEX)
+      list (SORT SOURCE_FILES_BISON)
+
+      math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
+      foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
+
+        list (GET SOURCE_FILES_FLEX ${FLEX_FILE_INDEX} CURRENT_FLEX_FILE)
+        get_filename_component (CURRENT_FLEX_FILE_NAME ${CURRENT_FLEX_FILE} NAME_WE)
+
+        list (GET SOURCE_FILES_BISON ${FLEX_FILE_INDEX} CURRENT_BISON_FILE)
+        get_filename_component (CURRENT_BISON_FILE_NAME ${CURRENT_BISON_FILE} NAME_WE)
+          
+        string (COMPARE EQUAL ${CURRENT_FLEX_FILE_NAME} ${CURRENT_BISON_FILE_NAME} ARE_FILES_EQUAL)
+
+        if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
+
+          # Note: files are generated in original source directory (not in patch!)
+          set (FLEX_BISON_TARGET_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}")
+
+          # choose apropriate extension for generated files: "cxx" if source file contains
+          # instruction to generate C++ code, "c" otherwise
+          set (BISON_OUTPUT_FILE_EXT "c")
+          set (FLEX_OUTPUT_FILE_EXT "c")
+          file (STRINGS "${CURRENT_BISON_FILE}" FILE_BISON_CONTENT)
+          foreach (FILE_BISON_CONTENT_LINE ${FILE_BISON_CONTENT})
+            string (REGEX MATCH "%language \"C\\+\\+\"" CXX_BISON_LANGUAGE_FOUND ${FILE_BISON_CONTENT_LINE})
+            if (CXX_BISON_LANGUAGE_FOUND)
+              set (BISON_OUTPUT_FILE_EXT "cxx")
+            endif()
+          endforeach()
+          file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
+          foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
+            string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
+            if (CXX_FLEX_LANGUAGE_FOUND)
+              set (FLEX_OUTPUT_FILE_EXT "cxx")
+
+              # install copy of FlexLexer.h locally to allow further building without flex
+              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+              endif()
+            endif()
+          endforeach()
+          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
+          set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.${FLEX_OUTPUT_FILE_EXT})
+
+          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} "${FLEX_BISON_TARGET_DIR}/${BISON_OUTPUT_FILE}"
+                        COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME} -l -M ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/=")
+          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} "${FLEX_BISON_TARGET_DIR}/${FLEX_OUTPUT_FILE}"
+                        COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME} -L")
+          ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
+           
+          list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
+        endif()
+      endforeach()
+    endif()
+  endif()
+
+  # header files
+  if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES")
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  else()
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  endif()
+    
+  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
+  list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
+  if(APPLE)
+    list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
+  endif()
+
+  foreach(HEADER_FILE ${HEADER_FILES})
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      list (APPEND USED_INCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+    else()
+      list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${HEADER_FILE}")
+    endif()
+  endforeach()
+
+  foreach(SOURCE_FILE ${SOURCE_FILES})
+    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      message (STATUS "Info: consider patched file: ${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      list (APPEND USED_SRCFILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${BUILD_PATCH}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    else()
+      list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE_NAME}" FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    endif()
+  endforeach()
+
+  if (USE_QT)
+    FIND_AND_INSTALL_QT_RESOURCES (${OCCT_PACKAGE} RESOURCE_FILES)
+    #message("Qt Resource files are: ${QT_RESOURCE_FILES} in ${OCCT_PACKAGE}")
+  endif(USE_QT)
+
+  #message("Resource files are: ${RESOURCE_FILES} in ${OCCT_PACKAGE}")
+  foreach(RESOURCE_FILE ${RESOURCE_FILES})
+    SOURCE_GROUP ("Resource Files\\${OCCT_PACKAGE_NAME}" FILES "${RESOURCE_FILE}")
+  endforeach()
 endforeach()
 string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
 
@@ -330,7 +353,7 @@ endif()
 
 # Update list of used VTK libraries if OpenGL2 Rendering BackEnd is used.
 # Add VTK_OPENGL2_BACKEND definition.
-if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
+if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2" OR IS_VTK_9XX)
   add_definitions(-DVTK_OPENGL2_BACKEND)
   foreach (VTK_EXCLUDE_LIBRARY vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL)
     list (FIND USED_TOOLKITS_BY_CURRENT_PROJECT "${VTK_EXCLUDE_LIBRARY}" IS_VTK_OPENGL_FOUND)
@@ -354,6 +377,9 @@ else()
 endif()
 
 if (BUILD_SHARED_LIBS)
+  if(IS_VTK_9XX)
+    string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
+  endif()
   target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
 endif()
 

adm/cmake/openvr.cmake

@@ -0,0 +1,5 @@
+# OpenVR SDK
+# OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
+# https://github.com/ValveSoftware/openvr
+
+THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")

adm/cmake/qt.cmake

@@ -1,23 +1,22 @@
 #qt
 
-#looking for 3RDPARTY_QT_DIR variable used later in qt_macro.cmake
-SET(CSF_QtCore "QtCore")
-THIRDPARTY_PRODUCT("QT" "" "CSF_QtCore" "d")
+# Qt is searched manually first (just determine root)
+message (STATUS "Processing Qt 3-rd party")
 
-list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
+if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
+  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
 
-list (REMOVE_ITEM 3RDPARTY_NOT_INCLUDED "3RDPARTY_QT_INCLUDE_DIR")
-list (REMOVE_ITEM 3RDPARTY_NO_LIBS "3RDPARTY_QT_LIBRARY_DIR")
-list (REMOVE_ITEM 3RDPARTY_NO_DLLS "3RDPARTY_QT_DLL_DIR")
+  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
+    set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
+    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
+  endif()
 
-UNSET (${3RDPARTY_QT_DLL} CACHE)
-UNSET (${3RDPARTY_QT_DLL_DIR} CACHE)
-UNSET (${3RDPARTY_QT_INCLUDE_DIR} CACHE)
-UNSET (${3RDPARTY_QT_LIBRARY} CACHE)
-UNSET (${3RDPARTY_QT_LIBRARY_DIR} CACHE)
+  # Combine directory name with absolute path and show in GUI
+  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
+  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
+endif()
 
 set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
 
 # Now set CMAKE_PREFIX_PATH to point to local Qt installation.
 # Without this setting find_package() will not work
@@ -34,3 +33,9 @@ if (NOT ${Qt5_FOUND})
 else()
   #message (STATUS "Qt5 cmake configuration")
 endif()
+
+if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
+  list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
+else()
+  list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
+endif()

adm/cmake/rapidjson.cmake

@@ -0,0 +1,86 @@
+# RapidJSON
+
+if (NOT DEFINED INSTALL_RAPIDJSON)
+  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
+endif()
+
+# RapidJSON directory
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
+  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
+endif()
+
+# search for RapidJSON in user defined directory
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
+    if (RAPIDJSON_DIR_NAME)
+      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
+    endif()
+  endif()
+endif()
+
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
+endif()
+
+if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+
+  set (HEADER_NAMES rapidjson/rapidjson.h)
+
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
+
+  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
+                                              PATH_SUFFIXES include rapidjson
+                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              NO_DEFAULT_PATH)
+  else()
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATH_SUFFIXES include rapidjson
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  endif()
+
+  # use default (CMake) RapidJSON search
+  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
+      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
+    endif()
+
+    find_package(RapidJSON QUIET)
+
+    # restore ENV{RapidJSON_DIR}
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
+    endif()
+
+    if (${RAPIDJSON_FOUND})
+      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
+      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
+    endif()
+  endif()
+endif()
+
+if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+
+  # Install header files
+  if (INSTALL_RAPIDJSON)
+    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
+    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
+      if(IS_DIRECTORY "${SUBDIR}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+      else()
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+      endif()
+    endforeach()
+  endif()
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
+endif()
+
+# unset all redundant variables
+OCCT_CHECK_AND_UNSET(RapidJSON_DIR)

adm/cmake/vardescr.cmake

@@ -28,6 +28,11 @@ Applies only for Debug configuration.")
 set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
 "Append the postfix to names of output libraries")
 
+set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
+"Disables exceptions like Standard_OutOfRange in Release builds.
+Defines No_Exception macros for Release builds when enabled (default).
+These exceptions are always enabled in Debug builds, but disable in Release for better performance")
+
 set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
 "Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
 Corresponding environment variable (CSF_FPE) can be changed manually
@@ -84,11 +89,13 @@ INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
 INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
 INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
 INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
 INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
 INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
 INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
 INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
 INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
@@ -156,6 +163,13 @@ set (USE_FREEIMAGE_DESCR
 "Indicates whether Freeimage product should be used in OCCT visualization
 module for support of popular graphics image formats (PNG, BMP etc)")
 
+set (USE_OPENVR_DESCR
+"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
+
+set (USE_RAPIDJSON_DESCR
+"Indicates whether RapidJSON product should be used in OCCT DataExchange
+module for support of JSON-based formats like glTF")
+
 set (USE_EGL_DESCR
 "Indicates whether EGL should be used in OCCT visualization
 module instead of conventional OpenGL context creation APIs")

adm/cmake/vtk.cmake

@@ -66,10 +66,15 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
   set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
 endif()
 
+unset (IS_VTK_9XX)
 if (VTK_FOUND)
-
-  # add compiler flags, preprocessor definitions, include and link dirs
-  include (${VTK_USE_FILE})
+  message ("VTK version (${VTK_VERSION})")
+  if(VTK_MAJOR_VERSION EQUAL 8 AND VTK_MINOR_VERSION GREATER 9 OR VTK_MAJOR_VERSION GREATER 8)
+    set (IS_VTK_9XX 1)
+  else()
+    # add compiler flags, preprocessor definitions, include and link dirs
+    include (${VTK_USE_FILE})
+  endif()
 
   if (VTK_LIBRARIES)
 
@@ -81,79 +86,83 @@ if (VTK_FOUND)
 #    endif()
 
     foreach (VTK_LIBRARY ${VTK_LIBRARIES})
-      string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
-      if (IS_VTK_LIBRARY AND TARGET ${VTK_LIBRARY})
-        # get paths from corresponding variables
-        if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
-          list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+      if (IS_VTK_9XX)
+        string (REGEX MATCH "^VTK::" IS_VTK_LIBRARY ${VTK_LIBRARY})
+      else()
+        string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
+      endif()
+      if (NOT IS_VTK_LIBRARY OR NOT TARGET ${VTK_LIBRARY})
+        continue()
+      endif()
+
+      # get paths from corresponding variables
+      if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+        list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+      endif()
+
+      if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+        list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+      endif()
+
+      if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        if (NOT WIN32)
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        endif()
+      endif()
+
+      # get paths from corresponding properties
+      get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
+      if (TARGET_VTK_IMPORT_CONFS)
+        list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+
+        # todo: choose configuration in connection with the build type
+        #if (CMAKE_BUILD_TYPE)
+        #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
+        #  endforeach()
+        #endif()
+
+        # Work-around against link failure in case if VTK contains dependency
+        # on DirectX: its run-time is always present on Windows, but SDK can
+        # be absent on current workstation, while not actually needed for
+        # OCCT linking.
+        # VTK 6.1 for VC 10
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          if (HARDCODED_D3D9_LIB)
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+            set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          endif()
+        endif()
+        # VTK 6.1 for VC 12, 14
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          if (HARDCODED_D3D9_LIB)
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+            set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          endif()
         endif()
 
-          if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-          endif()
+        get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+        if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
+          get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
+        endif()
 
-          if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-            if (NOT WIN32)
-              list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-            endif()
-          endif()
+        get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+        if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
+          get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
 
-          # get paths from corresponding properties
-          get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
-
-          if (TARGET_VTK_IMPORT_CONFS)
-            list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-
-            # todo: choose configuration in connection with the build type
-            #if (CMAKE_BUILD_TYPE)
-            #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
-            #  endforeach()
-            #endif()
-
-            # Work-around against link failure in case if VTK contains dependency
-            # on DirectX: its run-time is always present on Windows, but SDK can
-            # be absent on current workstation, while not actually needed for 
-            # OCCT linking.
-            # VTK 6.1 for VC 10
-            get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
-            if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-              string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-              if (HARDCODED_D3D9_LIB)
-                message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-
-                list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-                set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-              endif()
-            endif()
-            # VTK 6.1 for VC 12, 14
-            get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
-            if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-              string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-              if (HARDCODED_D3D9_LIB)
-                message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-
-                list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-                set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-              endif()
-            endif()
-
-            get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
-            if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
-              get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
-              list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
-            endif()
-
-            get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
-            if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
-              get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
-
-              if (WIN32)
-                list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-              else()
-                list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-              endif()
-            endif()
+          if (WIN32)
+            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
+          else()
+            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
           endif()
         endif()
       endif()
@@ -187,6 +196,7 @@ if (VTK_FOUND)
       endif()
     endif()
 #  endif()
+endif()
 
 if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
   list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})

adm/genconf.tcl

@@ -24,21 +24,44 @@
 # load tools
 source [file join [file dirname [info script]] genconfdeps.tcl]
 
+# proxy variable for implicit file path normalization
+set PRODUCTS_PATH_INPUT "$::PRODUCTS_PATH"
+
 package require Tk
 
 set aRowIter 0
 set aCheckRowIter 0
 frame .myFrame -padx 5 -pady 5
 pack  .myFrame -fill both -expand 1
+frame .myFrame.myPrjFrame
 frame .myFrame.myVsFrame
 frame .myFrame.myHxxChecks
 frame .myFrame.myChecks
 
+# project file format
+set SYS_PRJFMT_LIST {}
+set SYS_PRJNAME_LIST {}
+if { "$::tcl_platform(platform)" == "windows" } {
+  lappend ::SYS_PRJFMT_LIST "vcxproj"
+  lappend ::SYS_PRJNAME_LIST "Visual Studio (.vcxproj)"
+}
+if { "$tcl_platform(os)" == "Darwin" } {
+  lappend ::SYS_PRJFMT_LIST "xcd"
+  lappend ::SYS_PRJNAME_LIST "XCode (.xcd)"
+}
+lappend ::SYS_PRJFMT_LIST "cbp"
+lappend ::SYS_PRJNAME_LIST "Code Blocks (.cbp)"
+lappend ::SYS_PRJFMT_LIST "pro"
+lappend ::SYS_PRJNAME_LIST "Qt Creator (.pro)"
+
+set aPrjIndex [lsearch $::SYS_PRJFMT_LIST $::PRJFMT]
+set ::PRJNAME [lindex $::SYS_PRJNAME_LIST $aPrjIndex]
+
 set SYS_VS_LIST {}
 set SYS_VC_LIST {}
 set SYS_VCVARS_LIST {}
 
-# detect installed Visual Studio 2017 instances by running vswhere.exe
+# detect installed Visual Studio 2017+ instances by running vswhere.exe
 if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
   lappend ::SYS_VS_LIST "Visual Studio 2017 (15, toolset v141)"
   lappend ::SYS_VC_LIST "vc141"
@@ -49,6 +72,21 @@ if { ! [catch {exec vswhere.exe -version "\[15.0,15.99\]" -latest -requires Micr
   lappend ::SYS_VC_LIST "vc141-uwp"
   lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
 }
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.NativeDesktop -property installationPath} res] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142)"
+  lappend ::SYS_VC_LIST "vc142"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Workload.Universal -property installationPath} res] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset v142) UWP"
+  lappend ::SYS_VC_LIST "vc142-uwp"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
+}
+if { ! [catch {exec vswhere.exe -version "\[16.0,16.99\]" -latest -requires Microsoft.VisualStudio.Component.VC.ClangCL -property installationPath} res] } {
+  lappend ::SYS_VS_LIST "Visual Studio 2019 (16, toolset ClangCL)"
+  lappend ::SYS_VC_LIST "vclang"
+  lappend ::SYS_VCVARS_LIST "$res\\VC\\vcvarsall.bat"
+}
 
 # detect installed Visual Studio instances from global environment
 if { [info exists ::env(VS140COMNTOOLS)] } {
@@ -101,6 +139,7 @@ proc wokdep:gui:Close {} {
 }
 
 proc wokdep:gui:SwitchConfig {} {
+  set ::PRJFMT [lindex $::SYS_PRJFMT_LIST [.myFrame.myPrjFrame.myPrjCombo current]]
   set ::VCVER  [lindex $::SYS_VC_LIST     [.myFrame.myVsFrame.myVsCombo current]]
   set ::VCVARS [lindex $::SYS_VCVARS_LIST [.myFrame.myVsFrame.myVsCombo current]]
 
@@ -148,6 +187,9 @@ proc wokdep:gui:UpdateList {} {
   if { "$::HAVE_FFMPEG" == "true" } {
     wokdep:SearchFFmpeg  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
+  if { "$::HAVE_OPENVR" == "true" } {
+    wokdep:SearchOpenVR  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
   if { "$::HAVE_TBB" == "true" } {
     wokdep:SearchTBB     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
@@ -159,7 +201,11 @@ proc wokdep:gui:UpdateList {} {
   }
 
   if { "$::HAVE_ZLIB" == "true" } {
-    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "zlib" {"zlib"}
+    set aCheckLib "z"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "zlib"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
   }
   if { "$::HAVE_LIBLZMA" == "true" } {
     set aCheckLib "lzma"
@@ -168,10 +214,26 @@ proc wokdep:gui:UpdateList {} {
     }
     wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "liblzma" "lzma.h" "$aCheckLib" {"lzma" "xz"}
   }
-
-  if { "$::CHECK_QT4" == "true" } {
-    wokdep:SearchQt4     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  if { "$::HAVE_E57" == "true" } {
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "e57" "e57/E57Foundation.h" "E57RefImpl" {"e57"}
+    set aCheckLib "xerces-c"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "xerces-c_3"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "xerces-c" "xercesc/sax2/XMLReaderFactory.hpp" "$aCheckLib" {"xerces"}
   }
+  if { "$::HAVE_RAPIDJSON" == "true" } {
+    wokdep:SearchRapidJson anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
+  if {"$::BUILD_Inspector" == "true" } {
+    set ::CHECK_QT "true"
+  }
+
+  if { "$::CHECK_QT" == "true" } {
+    wokdep:SearchQt     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
+  }
+
   if { "$::CHECK_JDK" == "true" } {
     wokdep:SearchJDK     anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
   }
@@ -191,9 +253,9 @@ proc wokdep:gui:BrowseVcVars {} {
 }
 
 proc wokdep:gui:BrowsePartiesRoot {} {
-  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH -title "Choose a directory"]
+  set aResult [tk_chooseDirectory -initialdir $::PRODUCTS_PATH_INPUT -title "Choose a directory"]
   if { "$aResult" != "" } {
-    set ::PRODUCTS_PATH $aResult
+    set ::PRODUCTS_PATH_INPUT $aResult
     wokdep:gui:UpdateList
   }
 }
@@ -390,6 +452,8 @@ proc wokdep:gui:Show64Bitness { theRowIter } {
 }
 
 # Header
+ttk::label    .myFrame.myPrjFrame.myPrjLbl     -text "Project format:" -padding {5 5 20 5}
+ttk::combobox .myFrame.myPrjFrame.myPrjCombo   -values $SYS_PRJNAME_LIST -state readonly -textvariable PRJNAME -width 40
 ttk::label    .myFrame.myVsFrame.myVsLbl       -text "Visual Studio configuration:" -padding {5 5 20 5}
 ttk::combobox .myFrame.myVsFrame.myVsCombo     -values $SYS_VS_LIST -state readonly -textvariable VSVER -width 40
 ttk::combobox .myFrame.myVsFrame.myArchCombo   -values { {32} {64} } -textvariable ARCH -state readonly -width 6
@@ -405,12 +469,14 @@ ttk::label    .myFrame.myHxxChecks.myScutsLbl     -text "Strategy for filling he
 
 #
 ttk::label    .myFrame.mySrchLbl       -text "3rd-parties search path:" -padding {5 5 80 5}
-entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH -width 80
+entry         .myFrame.mySrchEntry     -textvariable PRODUCTS_PATH_INPUT -width 80
 ttk::button   .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
 checkbutton   .myFrame.myChecks.myFImageCheck   -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myFImageLbl     -text "Use FreeImage"
 checkbutton   .myFrame.myChecks.myTbbCheck      -offvalue "false" -onvalue "true" -variable HAVE_TBB       -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myTbbLbl        -text "Use Intel TBB"
+checkbutton   .myFrame.myChecks.myOpenVrCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENVR    -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myOpenVrLbl     -text "Use OpenVR"
 if { "$::tcl_platform(os)" != "Darwin" } {
   checkbutton .myFrame.myChecks.myGlesCheck     -offvalue "false" -onvalue "true" -variable HAVE_GLES2     -command wokdep:gui:UpdateList
   ttk::label  .myFrame.myChecks.myGlesLbl       -text "Use OpenGL ES"
@@ -423,6 +489,9 @@ checkbutton   .myFrame.myChecks.myFFmpegCheck   -offvalue "false" -onvalue "true
 ttk::label    .myFrame.myChecks.myFFmpegLbl     -text "Use FFmpeg"
 #checkbutton   .myFrame.myChecks.myOpenClCheck   -offvalue "false" -onvalue "true" -variable HAVE_OPENCL    -command wokdep:gui:UpdateList
 #ttk::label    .myFrame.myChecks.myOpenClLbl     -text "Use OpenCL"
+checkbutton   .myFrame.myChecks.myRapidJsonCheck -offvalue "false" -onvalue "true" -variable HAVE_RAPIDJSON -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myRapidJsonLbl   -text "Use RapidJSON"
+
 checkbutton   .myFrame.myChecks.myMacGLXCheck   -offvalue "false" -onvalue "true" -variable MACOSX_USE_GLX
 ttk::label    .myFrame.myChecks.myMacGLXLbl     -text "Use X11 for windows drawing"
 ttk::label    .myFrame.myChecks.myVtkLbl        -text "Use VTK"
@@ -432,12 +501,19 @@ checkbutton   .myFrame.myChecks.myZLibCheck     -offvalue "false" -onvalue "true
 ttk::label    .myFrame.myChecks.myZLibLbl       -text "Use zlib"
 checkbutton   .myFrame.myChecks.myLzmaCheck     -offvalue "false" -onvalue "true" -variable HAVE_LIBLZMA   -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myLzmaLbl       -text "Use liblzma"
+checkbutton   .myFrame.myChecks.myE57Check      -offvalue "false" -onvalue "true" -variable HAVE_E57       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myE57Lbl        -text "Use E57"
 
-checkbutton   .myFrame.myChecks.myQt4Check      -offvalue "false" -onvalue "true" -variable CHECK_QT4      -command wokdep:gui:UpdateList
-ttk::label    .myFrame.myChecks.myQt4Lbl        -text "Search Qt4"
+checkbutton   .myFrame.myChecks.myQtCheck       -offvalue "false" -onvalue "true" -variable CHECK_QT       -command wokdep:gui:UpdateList
+ttk::label    .myFrame.myChecks.myQtLbl         -text "Search Qt"
 checkbutton   .myFrame.myChecks.myJDKCheck      -offvalue "false" -onvalue "true" -variable CHECK_JDK      -command wokdep:gui:UpdateList
 ttk::label    .myFrame.myChecks.myJDKLbl        -text "Search JDK"
 
+if { "$::tcl_platform(platform)" == "windows" } {
+  checkbutton   .myFrame.myChecks.myInspectorBuild -offvalue "false" -onvalue "true" -variable BUILD_Inspector      -command wokdep:gui:UpdateList
+  ttk::label    .myFrame.myChecks.myInspectorLbl   -text "Build Inspector"
+}
+
 # Additional headers search paths
 ttk::label    .myFrame.myIncLbl    -text "Additional headers search paths:" -padding {5 5 80 5}
 scrollbar     .myFrame.myIncScrl   -command ".myFrame.myIncList yview"
@@ -494,6 +570,10 @@ ttk::button   .myFrame.myClose -text "Close" -command wokdep:gui:Close
 
 # Create grid
 # Header
+grid .myFrame.myPrjFrame            -row $aRowIter -column 0 -columnspan 10 -sticky w
+grid .myFrame.myPrjFrame.myPrjLbl   -row 0 -column 0
+grid .myFrame.myPrjFrame.myPrjCombo -row 0 -column 1
+incr aRowIter
 if { "$tcl_platform(platform)" == "windows" } {
   grid .myFrame.myVsFrame               -row $aRowIter -column 0 -columnspan 10 -sticky w
   grid .myFrame.myVsFrame.myVsLbl       -row 0 -column 0
@@ -537,8 +617,8 @@ if { "$::tcl_platform(os)" != "Darwin" } {
 grid .myFrame.myChecks.myZLibCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myZLibLbl       -row $aCheckRowIter -column 7 -sticky w
 
-grid .myFrame.myChecks.myQt4Check      -row $aCheckRowIter -column 10 -sticky e
-grid .myFrame.myChecks.myQt4Lbl        -row $aCheckRowIter -column 11 -sticky w
+grid .myFrame.myChecks.myQtCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myQtLbl        -row $aCheckRowIter -column 13 -sticky w
 
 incr aCheckRowIter
 grid .myFrame.myChecks.myFFmpegCheck   -row $aCheckRowIter -column 0 -sticky e
@@ -548,19 +628,30 @@ grid .myFrame.myChecks.myVtkLbl        -row $aCheckRowIter -column 3 -sticky w
 if { "$::tcl_platform(platform)" == "windows" } {
   grid .myFrame.myChecks.myD3dCheck    -row $aCheckRowIter -column 4 -sticky e
   grid .myFrame.myChecks.myD3dLbl      -row $aCheckRowIter -column 5 -sticky w
+} elseif { "$::tcl_platform(os)" == "Darwin" } {
+  grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 4 -sticky e
+  grid .myFrame.myChecks.myMacGLXLbl   -row $aCheckRowIter -column 5 -sticky w
 }
 grid .myFrame.myChecks.myLzmaCheck     -row $aCheckRowIter -column 6 -sticky e
 grid .myFrame.myChecks.myLzmaLbl       -row $aCheckRowIter -column 7 -sticky w
-grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 10 -sticky e
-grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 11 -sticky w
+grid .myFrame.myChecks.myJDKCheck      -row $aCheckRowIter -column 12 -sticky e
+grid .myFrame.myChecks.myJDKLbl        -row $aCheckRowIter -column 13 -sticky w
 
 incr aCheckRowIter
-if { "$::tcl_platform(os)" == "Darwin" } {
-  grid .myFrame.myChecks.myMacGLXCheck -row $aCheckRowIter -column 0 -sticky e
-  grid .myFrame.myChecks.myMacGLXLbl   -row $aCheckRowIter -column 1 -sticky w
-  incr aCheckRowIter
+grid .myFrame.myChecks.myRapidJsonCheck -row $aCheckRowIter -column 0 -sticky e
+grid .myFrame.myChecks.myRapidJsonLbl   -row $aCheckRowIter -column 1 -sticky w
+grid .myFrame.myChecks.myOpenVrCheck   -row $aCheckRowIter -column 4 -sticky e
+grid .myFrame.myChecks.myOpenVrLbl     -row $aCheckRowIter -column 5 -sticky w
+grid .myFrame.myChecks.myE57Check      -row $aCheckRowIter -column 6 -sticky e
+grid .myFrame.myChecks.myE57Lbl        -row $aCheckRowIter -column 7 -sticky w
+
+if { "$::tcl_platform(platform)" == "windows" } {
+  grid .myFrame.myChecks.myInspectorBuild      -row $aCheckRowIter -column 12 -sticky e
+  grid .myFrame.myChecks.myInspectorLbl        -row $aCheckRowIter -column 13 -sticky w
 }
 
+incr aCheckRowIter
+
 # Additional headers search paths
 grid .myFrame.myIncLbl    -row $aRowIter -column 0 -columnspan 10 -sticky w
 incr aRowIter
@@ -592,6 +683,9 @@ grid .myFrame.mySave  -row $aRowIter -column 4 -columnspan 2
 grid .myFrame.myClose -row $aRowIter -column 6 -columnspan 2
 
 # Bind events
+bind .myFrame.myPrjFrame.myPrjCombo <<ComboboxSelected>> {
+  wokdep:gui:SwitchConfig
+}
 bind .myFrame.myVsFrame.myVsCombo <<ComboboxSelected>> {
   wokdep:gui:SwitchConfig
 }
@@ -600,6 +694,7 @@ bind .myFrame.myVsFrame.myArchCombo <<ComboboxSelected>> {
 }
 
 .myFrame.mySrchEntry configure -validate all -validatecommand {
+  set ::PRODUCTS_PATH [file normalize "$::PRODUCTS_PATH_INPUT"]
   #return [file exists "$::PRODUCTS_PATH"]
   wokdep:gui:UpdateList
   return 1

adm/genconfdeps.tcl

@@ -27,8 +27,10 @@ if { "$tcl_platform(platform)" == "unix" } {
   set SYS_EXE_SUFFIX    ""
   if { "$tcl_platform(os)" == "Darwin" } {
     set SYS_LIB_SUFFIX "dylib"
+    set PRJFMT "xcd"
   } else {
     set SYS_LIB_SUFFIX "so"
+    set PRJFMT "cbp"
   }
   set VCVER "gcc"
   set VCVARS ""
@@ -39,6 +41,7 @@ if { "$tcl_platform(platform)" == "unix" } {
   set SYS_EXE_SUFFIX    ".exe"
   set VCVER  "vc10"
   set VCVARS ""
+  set PRJFMT "vcxproj"
 }
 
 set SHORTCUT_HEADERS "ShortCut"
@@ -65,7 +68,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
 }
 
 # fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
-set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
+set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_E57 HAVE_RAPIDJSON HAVE_OPENVR HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo BUILD_Inspector}
 foreach anEnvIter $THE_ENV_VARIABLES {
   set ${anEnvIter} "false"
   if { [info exists ::env(${anEnvIter})] } {
@@ -82,11 +85,14 @@ if { "$tcl_platform(platform)" != "windows" } {
   set HAVE_D3D ""
   set HAVE_RelWithDebInfo ""
 }
-foreach anEnvIter {ARCH VCVER VCVARS PRODUCTS_PATH} {
+foreach anEnvIter {ARCH VCVER VCVARS PRJFMT } {
   if { [info exists ::env(${anEnvIter})] } {
     set ${anEnvIter} "$::env(${anEnvIter})"
   }
 }
+if { [info exists ::env(PRODUCTS_PATH)] } {
+  set PRODUCTS_PATH [file normalize "$::env(PRODUCTS_PATH)"]
+}
 
 if { [info exists ::env(CSF_OPT_INC)] } {
   set CSF_OPT_INC [split "$::env(CSF_OPT_INC)" $::SYS_PATH_SPLITTER]
@@ -140,9 +146,12 @@ proc wokdep:SearchHeader {theHeader} {
 # Search library file in $::CSF_OPT_LIB* and standard paths
 proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
   if { "$theSearchPath" != "" } {
-    set aPath "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath  "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath2 "${theSearchPath}/${::SYS_LIB_PREFIX}${theLib}.a"
     if { [file exists "$aPath"] } {
       return "$aPath"
+    } elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
+      return "$aPath2"
     } else {
       return ""
     }
@@ -150,31 +159,42 @@ proc wokdep:SearchLib {theLib theBitness {theSearchPath ""}} {
 
   # search in custom paths
   foreach aLibPath [set ::CSF_OPT_LIB$theBitness] {
-    set aPath "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath  "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath2 "${aLibPath}/${::SYS_LIB_PREFIX}${theLib}.a"
     if { [file exists "$aPath"] } {
       return "$aPath"
+    } elseif { "$::tcl_platform(platform)" != "windows" && [file exists "$aPath2"] } {
+      return "$aPath2"
     }
   }
 
   # search in system
   if { "$::ARCH" == "$theBitness"} {
-    set aPath "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath  "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.${::SYS_LIB_SUFFIX}"
+    set aPath2 "/usr/lib/${::SYS_LIB_PREFIX}${theLib}.a"
     if { [file exists "$aPath"] } {
       return "$aPath"
+    } elseif { [file exists "$aPath2"] } {
+      return "$aPath2"
     }
   }
 
-
   if { "$::tcl_platform(os)" == "Linux" } {
     if { "$theBitness" == "64" } {
-      set aPath "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
+      set aPath  "/usr/lib/x86_64-linux-gnu/lib${theLib}.so"
+      set aPath2 "/usr/lib/x86_64-linux-gnu/lib${theLib}.a"
       if { [file exists "$aPath"] } {
         return "$aPath"
+      } elseif { [file exists "$aPath2"] } {
+        return "$aPath2"
       }
     } else {
-      set aPath "/usr/lib/i386-linux-gnu/lib${theLib}.so"
+      set aPath  "/usr/lib/i386-linux-gnu/lib${theLib}.so"
+      set aPath2 "/usr/lib/i386-linux-gnu/lib${theLib}.a"
       if { [file exists "$aPath"] } {
         return "$aPath"
+      } elseif { [file exists "$aPath2"] } {
+        return "$aPath2"
       }
     }
   }
@@ -221,7 +241,11 @@ proc wokdep:Preferred {theList theCmpl theArch} {
 
   # keep only two first digits in "vc141"
   if { ! [regexp {^vc[0-9][0-9]} $theCmpl aCmpl] } {
-    set aCmpl $theCmpl
+    if { [regexp {^vclang} $theCmpl] } { 
+      set aCmpl vc14
+    } else {
+      set aCmpl $theCmpl
+    }
   }
 
   set aShortList {}
@@ -601,6 +625,59 @@ proc wokdep:SearchFFmpeg {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBi
   return "$isFound"
 }
 
+# Search OpenVR SDK placement
+proc wokdep:SearchOpenVR {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc   anErrInc
+  upvar $theErrLib32 anErrLib32
+  upvar $theErrLib64 anErrLib64
+  upvar $theErrBin32 anErrBin32
+  upvar $theErrBin64 anErrBin64
+
+  set isFound "true"
+  set anOpenVrHPath [wokdep:SearchHeader "openvr.h"]
+  if { "$anOpenVrHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{openvr}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/openvr.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } elseif { "$aPath" != "" && [file exists "$aPath/headers/openvr.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/headers"
+    } else {
+      lappend anErrInc "Error: 'openvr.h' not found (OpenVR)"
+      set isFound "false"
+    }
+  }
+
+  set aPlatform "unknown"
+  if { "$::tcl_platform(platform)" == "windows" } {
+    set aPlatform "win"
+  } elseif { "$::tcl_platform(os)" == "Darwin" } {
+    set aPlatform "osx"
+  } elseif { "$::tcl_platform(os)" == "Linux" } {
+    set aPlatform "linux"
+  }
+
+  foreach anArchIter {64 32} {
+    set anOpenVrLibPath [wokdep:SearchLib "openvr_api" "$anArchIter"]
+    if { "$anOpenVrLibPath" == "" } {
+      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{openvr}*] "$::VCVER" "$anArchIter" ]
+      set anOpenVrLibPath  [wokdep:SearchLib "openvr_api" "$anArchIter" "$aPath/lib/${aPlatform}${anArchIter}"]
+      set anOpenVrLibPath2 [wokdep:SearchLib "openvr_api" "$anArchIter" "$aPath/lib"]
+      if { "$anOpenVrLibPath" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib/${aPlatform}${anArchIter}"
+        lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin/${aPlatform}${anArchIter}"
+      } elseif { "$anOpenVrLibPath2" != "" } {
+        lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
+        lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
+      } else {
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}openvr_api.${::SYS_LIB_SUFFIX}' not found (OpenVR)"
+        if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
+      }
+    }
+  }
+
+  return "$isFound"
+}
+
 # Search TBB library placement
 proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
   upvar $theErrInc   anErrInc
@@ -611,7 +688,11 @@ proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
 
   # keep only two first digits in "vc141"
   if { ! [regexp {^vc[0-9][0-9]} ${::VCVER} aVcLib] } {
-    set aVcLib ${::VCVER}
+    if { [regexp {^vclang} ${::VCVER}] } {
+      set aVcLib vc14
+    } else {
+      set aVcLib ${::VCVER}
+    }
   }
 
   set isFound "true"
@@ -855,6 +936,25 @@ proc wokdep:SearchGLES {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin6
   return "$isFound"
 }
 
+# Search RapidJSON headers
+proc wokdep:SearchRapidJson {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+  upvar $theErrInc anErrInc
+
+  set isFound "true"
+  set aRJHPath [wokdep:SearchHeader "rapidjson/rapidjson.h"]
+  if { "$aRJHPath"  == "" } {
+    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{rapidjson}*] "$::VCVER" "$::ARCH" ]
+    if { "$aPath" != "" && [file exists "$aPath/include/rapidjson/rapidjson.h"] } {
+      lappend ::CSF_OPT_INC "$aPath/include"
+    } else {
+      lappend anErrInc "Error: 'rapidjson/rapidjson.h' not found (RapidJSON)"
+      set isFound "false"
+    }
+  }
+
+  return "$isFound"
+}
+
 # Auxiliary function, gets VTK version to set default search directory
 proc wokdep:VtkVersion { thePath } {
   set aResult "6.1"
@@ -975,8 +1075,8 @@ proc wokdep:SearchVTK {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   return "$isFound"
 }
 
-# Search Qt4 libraries placement
-proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
+# Search Qt libraries placement
+proc wokdep:SearchQt {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64} {
   upvar $theErrInc   anErrInc
   upvar $theErrLib32 anErrLib32
   upvar $theErrLib64 anErrLib64
@@ -984,53 +1084,46 @@ proc wokdep:SearchQt4 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   upvar $theErrBin64 anErrBin64
 
   set isFound "true"
-  set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qmessagebox.h"]
+  set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt}*] "$::VCVER" "$::ARCH" ] 
+  set aQMsgBoxHPath [wokdep:SearchHeader "QtGui/qguiapplication.h"]
   if { "$aQMsgBoxHPath" == "" } {
-    set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$::ARCH" ]
-    if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qmessagebox.h"] } {
+    if { "$aPath" != "" && [file exists "$aPath/include/QtGui/qguiapplication.h"] } {
       lappend ::CSF_OPT_INC "$aPath/include"
       lappend ::CSF_OPT_INC "$aPath/include/Qt"
       lappend ::CSF_OPT_INC "$aPath/include/QtGui"
       lappend ::CSF_OPT_INC "$aPath/include/QtCore"
+      lappend ::CSF_OPT_INC "$aPath/include/QtWidgets"
+      lappend ::CSF_OPT_INC "$aPath/include/QtXml"
     } else {
-      if { [file exists "/usr/include/qt4/QtGui/qmessagebox.h"] } {
-        lappend ::CSF_OPT_INC "/usr/include/qt4"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/Qt"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/QtGui"
-        lappend ::CSF_OPT_INC "/usr/include/qt4/QtCore"
-      } else {
-        lappend anErrInc "Error: 'QtGui/qmessagebox.h' not found (Qt4)"
+      lappend anErrInc "Error: 'QtGui/qguiapplication.h' not found"
         set isFound "false"
-      }
     }
   }
 
   set aQtGuiLibName "QtGui"
   if { "$::tcl_platform(platform)" == "windows" } {
-    set aQtGuiLibName "QtGui4"
+    set aQtGuiLibName "Qt5Gui"
   }
 
   foreach anArchIter {64 32} {
     set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter"]
     if { "$aQMsgBoxLibPath" == "" } {
-      set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
       set aQMsgBoxLibPath [wokdep:SearchLib "${aQtGuiLibName}" "$anArchIter" "$aPath/lib"]
       if { "$aQMsgBoxLibPath" != "" } {
         lappend ::CSF_OPT_LIB$anArchIter "$aPath/lib"
       } else {
-        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt4)"
+        lappend anErrLib$anArchIter "Error: '${::SYS_LIB_PREFIX}${aQtGuiLibName}.${::SYS_LIB_SUFFIX}' not found (Qt)"
         if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
       }
     }
     if { "$::tcl_platform(platform)" == "windows" } {
-      set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter"]
+      set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter"]
       if { "$aQMsgBoxDllPath" == "" } {
-        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{qt4}*] "$::VCVER" "$anArchIter" ]
-        set aQMsgBoxDllPath [wokdep:SearchBin "QtGui4.dll" "$anArchIter" "$aPath/bin"]
+        set aQMsgBoxDllPath [wokdep:SearchBin "${aQtGuiLibName}.dll" "$anArchIter" "$aPath/bin"]
         if { "$aQMsgBoxDllPath" != "" } {
           lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin"
         } else {
-          lappend anErrBin$anArchIter "Error: 'QtGui4.dll' not found (Qt4)"
+          lappend anErrBin$anArchIter "Error: '${aQtGuiLibName}.dll' not found (Qt)"
           if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
         }
       }
@@ -1118,15 +1211,33 @@ proc wokdep:SearchX11 {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
   return "$isFound"
 }
 
+# Returns OCCT version string from file Standard_Version.hxx (if available)
+proc wokdep:DetectCasVersion {} {
+  set occt_ver 7.0.0
+  set aCasRoot [file normalize [file dirname [info script]]]
+  set filename "${aCasRoot}/src/Standard/Standard_Version.hxx"
+  if { [file exists $filename] } {
+    set fh [open $filename "r"]
+    set fh_loaded [read $fh]
+    close $fh
+    regexp {[^/]\s*#\s*define\s+OCC_VERSION_COMPLETE\s+\"([^\s]*)\"} $fh_loaded dummy occt_ver
+  } else {
+    puts "Error: file '$filename' not found"
+  }
+  return $occt_ver
+}
+
 # Generate (override) custom environment file
 proc wokdep:SaveCustom {} {
+  set aGenInfo "This environment file was generated by genconf.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
   if { "$::tcl_platform(platform)" == "windows" } {
     set aCustomFilePath "./custom.bat"
     set aFile [open $aCustomFilePath "w"]
     puts $aFile "@echo off"
-    puts $aFile "rem This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+    puts $aFile "rem $aGenInfo"
 
     puts $aFile ""
+    puts $aFile "set PRJFMT=$::PRJFMT"
     puts $aFile "set VCVER=$::VCVER"
     puts $aFile "set ARCH=$::ARCH"
     puts $aFile "set VCVARS=$::VCVARS"
@@ -1146,26 +1257,41 @@ proc wokdep:SaveCustom {} {
     }
 
     set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional headers search paths"
     puts $aFile "set \"CSF_OPT_INC=$aStringInc\""
 
     set aStringLib32 [join $::CSF_OPT_LIB32 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib32 [regsub -all "$::PRODUCTS_PATH" $aStringLib32 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional libraries (32-bit) search paths"
     puts $aFile "set \"CSF_OPT_LIB32=$aStringLib32\""
 
     set aStringLib64 [join $::CSF_OPT_LIB64 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib64 [regsub -all "$::PRODUCTS_PATH" $aStringLib64 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional libraries (64-bit) search paths"
     puts $aFile "set \"CSF_OPT_LIB64=$aStringLib64\""
 
     set aStringBin32 [join $::CSF_OPT_BIN32 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin32 [regsub -all "$::PRODUCTS_PATH" $aStringBin32 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional (32-bit) search paths"
     puts $aFile "set \"CSF_OPT_BIN32=$aStringBin32\""
 
     set aStringBin64 [join $::CSF_OPT_BIN64 $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin64 [regsub -all "$::PRODUCTS_PATH" $aStringBin64 "%PRODUCTS_PATH%"]
+    }
     puts $aFile ""
     puts $aFile "rem Additional (64-bit) search paths"
     puts $aFile "set \"CSF_OPT_BIN64=$aStringBin64\""
@@ -1175,9 +1301,10 @@ proc wokdep:SaveCustom {} {
     set aCustomFilePath "./custom.sh"
     set aFile [open $aCustomFilePath "w"]
     puts $aFile "#!/bin/bash"
-    puts $aFile "# This environment file was generated by wok_depsgui.tcl script at [clock format [clock seconds] -format "%Y.%m.%d %H:%M"]"
+    puts $aFile "# $aGenInfo"
 
     puts $aFile ""
+    puts $aFile "export PRJFMT=$::PRJFMT"
     puts $aFile "export ARCH=$::ARCH"
     puts $aFile "export SHORTCUT_HEADERS=$::SHORTCUT_HEADERS"
 
@@ -1195,22 +1322,88 @@ proc wokdep:SaveCustom {} {
     }
 
     set aStringInc [join $::CSF_OPT_INC $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringInc [regsub -all "$::PRODUCTS_PATH" $aStringInc "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional headers search paths"
     puts $aFile "export CSF_OPT_INC=\"$aStringInc\""
 
-    set aStringLib$::ARCH [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
+    set aStringLib [join [set ::CSF_OPT_LIB$::ARCH] $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringLib [regsub -all "$::PRODUCTS_PATH" $aStringLib "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional libraries ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib$::ARCH]\""
+    puts $aFile "export CSF_OPT_LIB$::ARCH=\"[set aStringLib]\""
 
-    set aStringBin$::ARCH [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
+    set aStringBin [join [set ::CSF_OPT_BIN$::ARCH] $::SYS_PATH_SPLITTER]
+    if { "$::PRODUCTS_PATH" != "" } {
+      set aStringBin [regsub -all "$::PRODUCTS_PATH" $aStringBin "\${PRODUCTS_PATH}"]
+    }
     puts $aFile ""
     puts $aFile "# Additional ($::ARCH-bit) search paths"
-    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin$::ARCH]\""
+    puts $aFile "export CSF_OPT_BIN$::ARCH=\"[set aStringBin]\""
 
     close $aFile
   }
-
   puts "Configuration saved to file '$aCustomFilePath'"
+
+  # generate custom.auto.pri
+  set toExportCustomPri 1
+  if { $toExportCustomPri == 1 } {
+    set aCasVer [wokdep:DetectCasVersion]
+    set aCustomFilePath "./adm/qmake/custom.auto.pri"
+    set aFile [open $aCustomFilePath "w"]
+    puts $aFile "# $aGenInfo"
+
+    puts $aFile ""
+    puts $aFile "VERSION=$aCasVer"
+    puts $aFile "PRODUCTS_PATH=\"$::PRODUCTS_PATH\""
+
+    puts $aFile ""
+    puts $aFile "# Optional 3rd-parties switches"
+    foreach anEnvIter $::THE_ENV_VARIABLES {
+      set aName ${anEnvIter}
+      set aValue [set ::${anEnvIter}]
+      if { "$aValue" == "true" } {
+        puts $aFile "CONFIG += ${aName}"
+      } else {
+        #puts $aFile "CONFIG -= ${aName}"
+      }
+    }
+
+    puts $aFile ""
+    puts $aFile "# Additional headers search paths"
+    foreach anIncPath $::CSF_OPT_INC {
+      if { "$::PRODUCTS_PATH" != "" } {
+        set anIncPath [regsub -all "$::PRODUCTS_PATH" $anIncPath "\$\$\{PRODUCTS_PATH\}"]
+      }
+      puts $aFile "INCLUDEPATH += \"${anIncPath}\""
+    }
+
+    puts $aFile ""
+    puts $aFile "# Additional libraries search paths"
+    foreach aLibPath [set ::CSF_OPT_LIB$::ARCH] {
+      if { "$::PRODUCTS_PATH" != "" } {
+        set aLibPath [regsub -all "$::PRODUCTS_PATH" $aLibPath "\$\$\{PRODUCTS_PATH\}"]
+      }
+      puts $aFile "LIBS += -L\"${aLibPath}\""
+    }
+
+    if { "$::tcl_platform(platform)" == "windows" } {
+      puts $aFile ""
+      puts $aFile "# Additional DLLs search paths"
+      foreach aDllPath [set ::CSF_OPT_BIN$::ARCH] {
+        if { "$::PRODUCTS_PATH" != "" } {
+          set aDllPath [regsub -all "$::PRODUCTS_PATH" $aDllPath "\$\$\{PRODUCTS_PATH\}"]
+        }
+        puts $aFile "LIBS += -L\"${aDllPath}\""
+      }
+    }
+
+    puts $aFile ""
+    close $aFile
+    puts "Configuration saved to file '$aCustomFilePath'"
+  }
 }

adm/occaux.tcl

@@ -179,8 +179,10 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
   }
   if {"$is_win" == "yes"} {
     set exe ".exe"
+    set com ".com"
   } else {
     set exe ""
+    set com ""
   }
 
   set g_flag "no"
@@ -224,11 +226,11 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
       }
     }
     if {$i_flag == "no"} {
-      if { [file exists $path/inkscape$exe] } {
+      if { [file exists $path/inkscape$com] } {
         catch { exec $path/inkscape -V } version
         puts "Info: $version " 
         puts "      found in $path."
-        set inkscape_path "$path/inkscape$exe"
+        set inkscape_path "$path/inkscape$com"
         set i_flag "yes"
       }
     }
@@ -356,15 +358,29 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
 # Convert SVG files to PDF format to allow including them to PDF
 # (requires InkScape to be in PATH)
 proc OCCDoc_ProcessSvg {latexDir verboseMode} {
+  set anSvgList [glob -nocomplain $latexDir/*.svg]
+  if { $anSvgList == {} } {
+    return
+  }
 
-  foreach file [glob -nocomplain $latexDir/*.svg] {
+  catch { exec inkscape -V } anInkVer
+  set isOldSyntax 0
+  if {[string match "Inkscape 0.*" $anInkVer]} { set isOldSyntax 1 }
+  foreach file $anSvgList {
     if {$verboseMode == "YES"} {
       puts "Info: Converting file $file..."
     }
     set pdffile "[file rootname $file].pdf"
-    if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } {
-      #puts "Error: $res."
-      return
+    if { $isOldSyntax == 1 } {
+      if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } {
+        #puts "Error: $res."
+        return
+      }
+    } else {
+      if { [catch {exec inkscape $file --export-area-drawing --export-type=pdf --export-filename=$pdffile} res] } {
+        #puts "Error: $res."
+        return
+      }
     }
   }
 }
@@ -899,4 +915,4 @@ proc OCCDoc_ProcessTex {{texFiles {}} {latexDir} verboseMode} {
     file delete -force $TEX
     file rename $TMPFILENAME $TEX
   }
-}
+}

adm/qmake/.gitignore

@@ -0,0 +1,5 @@
+/*/*.pro
+/*/*/*.pro
+*.pro.user
+custom.pri
+custom.auto.pri

adm/qmake/OccCppConfig.pri

@@ -0,0 +1,157 @@
+# This is project defines C++ compilation rules for building an OCCT Toolkit.
+
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+# Disable some dummy Qt defaults
+QT -= core gui
+CONFIG -= qt app_bundle
+CONFIG -= qml_debug
+CONFIG -= debug_and_release
+
+OccGitRoot = $$_PRO_FILE_PWD_/../../../..
+
+# Define compilation flags
+CONFIG += warn_on
+QMAKE_CFLAGS_WARN_ON   = -Wall
+QMAKE_CXXFLAGS_WARN_ON = -Wall
+win32 {
+  QMAKE_CFLAGS_WARN_ON   = -W4
+  QMAKE_CXXFLAGS_WARN_ON = -W4
+  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
+  QMAKE_CXXFLAGS_STL_ON = /EHa
+
+  QMAKE_CXXFLAGS += -fp:precise
+  #QMAKE_CXXFLAGS -= -Zc:throwingNew
+  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
+
+  QMAKE_LFLAGS += -INCREMENTAL:NO
+
+  CONFIG(debug, debug|release) {
+    QMAKE_CXXFLAGS += -Od
+    QMAKE_CXXFLAGS += -Ob1
+  }
+
+  DEFINES -= WIN32
+  DEFINES -= WIN64
+  DEFINES += _CRT_SECURE_NO_WARNINGS
+  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
+  DEFINES += _SCL_SECURE_NO_WARNINGS
+} else {
+  CONFIG += c++11
+  QMAKE_CFLAGS   += -fexceptions
+  QMAKE_CXXFLAGS += -fexceptions
+  QMAKE_CXXFLAGS += -fvisibility=default
+  DEFINES += OCC_CONVERT_SIGNALS
+  mac {
+    iphoneos {
+      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+    } else {
+      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+    }
+  }
+}
+!CONFIG(debug, debug|release) {
+  # disable exceptions in Release builds
+  DEFINES += No_Exception
+  HAVE_RelWithDebInfo {
+    win32 {
+      CONFIG += force_debug_info
+    }
+  }
+}
+
+# Define output folder depending on compiler name
+MY_BITNESS = 32
+
+equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
+equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
+has64Target = $$find(QMAKE_TARGET.arch, "x64")
+count(has64Target, 1) { MY_BITNESS = 64 }
+
+MY_PLATFORM = platform
+CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
+} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
+} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
+} else:win32   { MY_PLATFORM = win$$MY_BITNESS
+} else:mac     { MY_PLATFORM = mac
+} else:linux   { MY_PLATFORM = lin
+} else:unix    { MY_PLATFORM = unix
+} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
+
+MY_COMPILER = compiler
+MY_VC_VER = 0
+android-g++ {
+  MY_COMPILER = gcc
+} else:clang {
+  MY_COMPILER = clang
+} else:gcc {
+  MY_COMPILER = gcc
+} else:win32-msvc2010 {
+  MY_COMPILER = vc10
+  MY_VC_VER = 10
+} else:win32-msvc2012 {
+  MY_COMPILER = vc11
+  MY_VC_VER = 11
+} else:win32-msvc2013 {
+  MY_COMPILER = vc12
+  MY_VC_VER = 12
+} else:win32-msvc2015 {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+} else:win32-msvc2017 {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+} else:win32-msvc {
+  MY_COMPILER = vc14
+  MY_VC_VER = 14
+  aMsvcVer = $$(VisualStudioVersion)
+  equals(aMsvcVer, 14.0){
+    # VS2015, vc140
+  } else:equals(aMsvcVer, 15.0){
+    # VS2015, vc141
+  } else:equals(aMsvcVer, 16.0){
+    # VS2019, vc142
+  } else {
+    warning (Unknown msvc version. "$$MY_COMPILER" is used)
+  }
+} else {
+  warning (Unknown compiler. "$$MY_COMPILER" is used)
+}
+MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
+#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
+
+CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
+
+DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
+win32 {
+  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
+  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
+  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
+
+  # dummy target creating lib/libd folder
+  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
+  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
+  occtkgen_libfolder.config = verbatim
+  QMAKE_SUBSTITUTES += occtkgen_libfolder
+
+  LIBS += -L$$aLibDest
+  equals(TEMPLATE, lib) {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
+  } else {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
+  }
+  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
+  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
+  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
+} else {
+  LIBS += -L$$DESTDIR
+  equals(TEMPLATE, app) {
+    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
+  }
+}
+
+#OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
+OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}

adm/qmake/OccModule.pri

@@ -0,0 +1,36 @@
+# This is a project template file defining an OCCT Module.
+# This project should be included with predefined OCC_MODULE_NAME variable.
+TEMPLATE = subdirs
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+# Iterate over Toolkits within current Module and generate sub-project per Toolkit
+aModuleList = $$cat(../MODULES, lines)
+for (aModuleIter, aModuleList) {
+  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
+  aModule = $$first($$list($$aModuleIter))
+  equals (aModule, $$OCC_MODULE_NAME) {
+    for (aToolKit, $$list($$aModuleIter)) {
+      toSkipToolkit = 0
+      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
+      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
+      equals (toSkipToolkit, 0) {
+        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
+        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
+        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
+        eval(occtkgen_$${aToolKit}.config = verbatim)
+        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
+        SUBDIRS += $${aToolKit}
+
+        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
+        aTkDepends = $${aToolKit}.depends
+        for (aModExtIter, aModExtList) {
+          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
+        }
+        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
+      }
+    }
+  }
+}

adm/qmake/OccModule.pro.in

@@ -0,0 +1,2 @@
+OCC_MODULE_NAME = \$\$TARGET
+include(../OccModule.pri)

adm/qmake/OccToolkit.pri

@@ -0,0 +1,144 @@
+# This is a project template file defining an OCCT Toolkit.
+# This project should be included with predefined OCC_TOOLKIT_NAME variable.
+
+TEMPLATE = lib
+!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
+  TEMPLATE = app
+  CONFIG += console
+}
+win32 {
+  # do not append version to DLL name
+  CONFIG += skip_target_version_ext
+}
+
+include(OccCppConfig.pri)
+
+aSrcRoot = $$OccGitRoot/src
+aHxxRoot = $$OccGitRoot/inc
+INCLUDEPATH += $$aHxxRoot
+
+# CSF variables
+CSF_FREETYPE  = -lfreetype
+CSF_TclLibs   = -ltcl8.6
+CSF_TclTkLibs = -ltk8.6
+HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
+HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
+HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
+HAVE_ZLIB      { CSF_ZLIB = -lzlib }
+HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
+win32 {
+  CSF_kernel32   = -lkernel32
+  CSF_advapi32   = -ladvapi32
+  CSF_gdi32      = -lgdi32
+  CSF_user32     = -luser32 -lcomdlg32
+  CSF_shell32    = -lShell32
+  CSF_opengl32   = -lopengl32
+  CSF_wsock32    = -lwsock32
+  CSF_netapi32   = -lnetapi32
+  CSF_OpenGlLibs = -lopengl32
+  HAVE_GLES2 { CSF_OpenGlLibs = -llibEGL -llibGLESv2 }
+  CSF_psapi      = -lPsapi
+  CSF_winmm      = -lwinmm
+  CSF_d3d9       = -ld3d9
+  CSF_TclLibs    = -ltcl86
+  CSF_TclTkLibs  = -ltk86
+  CSF_TBB =
+} else:mac {
+  CSF_dl         = -ldl
+  CSF_objc       = -lobjc
+  iphoneos {
+    CSF_Appkit     = -framework UIKit
+    CSF_OpenGlLibs = -framework OpenGLES
+  } else {
+    CSF_Appkit     = -framework AppKit
+    CSF_OpenGlLibs = -framework OpenGL
+  }
+  CSF_IOKit      = -framework IOKit
+  CSF_TclLibs    = -framework Tcl
+  CSF_TclTkLibs  = -framework Tk
+} else {
+  CSF_dl = -ldl
+  CSF_ThreadLibs = -lpthread -lrt
+  CSF_OpenGlLibs = -lGL
+  CSF_TclTkLibs  = -lX11 -ltk8.6
+  CSF_XwLibs     = -lX11 -lXext -lXmu -lXi
+  CSF_MotifLibs  = -lX11
+  CSF_fontconfig = -lfontconfig
+  HAVE_GLES2 { CSF_OpenGlLibs = -lEGL -lGLESv2 }
+}
+
+for (aCfgIter, CONFIG) {
+  aRes = $$find(aCfgIter, "^HAVE_")
+  count(aRes, 1) {
+    DEFINES += $$aCfgIter
+  }
+}
+
+# Define the list of standard OCCT file extensions
+aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
+aPxxRegex = ^.*\.(pxx)$
+aCxxRegex = ^.*\.(cxx|cpp|c)$
+mac { aCxxRegex = ^.*\.(cxx|cpp|c|m|mm)$ }
+
+# Auxiliary function for probing file extension
+defineTest (occCheckExtension) {
+  aProbe = $$find(1, "$$2")
+  count(aProbe, 1) { return(true) } else { return(false) }
+}
+
+# Auxiliary function for probing compilable files
+defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
+
+# Auxiliary function for probing header files
+defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
+
+aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
+aTkFiles += CMakeLists.txt
+aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
+anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
+
+for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
+for (anExternLib, anExternLibs) {
+  hasCsf = $$find(anExternLib, CSF_)
+  count(hasCsf, 1) {
+    aList = $$split($$anExternLib, "\n")
+    LIBS += $$aList
+  } else {
+    LIBS += -l$$anExternLib
+  }
+}
+
+# Iterate over Packages and add compilable files into this project
+isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
+for (aPackage, aPackages) {
+  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
+  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
+  for (aFileIter, aPackageFiles) {
+    occIsCxxFile($$aFileIter) {
+      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
+    }
+  }
+}
+
+# extend clean with versioned .so files
+!win32 {
+  aVerList = $$split(VERSION, ".")
+  aVerMaj = $$member(aVerList, 0)
+  aVerMin = $$member(aVerList, 1)
+  aVerMic = $$member(aVerList, 2)
+  equals(TEMPLATE, app) {
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
+  } else {
+    mac {
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
+    } else {
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
+    }
+  }
+}

adm/qmake/OccToolkit.pro.in

@@ -0,0 +1,2 @@
+OCC_TOOLKIT_NAME = \$\$TARGET
+include(../../OccToolkit.pri)

adm/qmake/Occt.pro

@@ -0,0 +1,41 @@
+# This is an experimental Solution project for building entire OCCT framework using qmake.
+# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
+# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
+# Building OCCT using CMake is a preferred solution.
+#
+# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
+# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
+# - Launch genproj to fill in "inc" folder with links to header files.
+# - Open project in Qt Creator, and call "Run qmake".
+# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
+# - "Run qmake" and perform Build.
+TEMPLATE = subdirs
+exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.pri)      { include(custom.pri) }
+
+OTHER_FILES += OccModule.pro.in \
+               OcctHeaderLink.hxx.in \
+               OccToolkit.pro.in \
+               OccCppConfig.pri \
+               OccModule.pri \
+               OccToolkit.pri \
+               custom.pri.template
+
+# Iterate over Modules and generate sub-projects
+aSolModuleList = $$cat(../MODULES, lines)
+for (aSolModuleIter, aSolModuleList) {
+  aSolModule = $$first($$list($$aSolModuleIter))
+  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
+  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
+  eval(occtkgen_$${aSolModule}.config = verbatim)
+  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
+  SUBDIRS += $${aSolModule}
+}
+
+# These dependencies are manually defined
+ModelingData.depends = FoundationClasses
+ModelingAlgorithms.depends = FoundationClasses ModelingData
+Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
+ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
+DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
+Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization

adm/qmake/OcctHeaderLink.hxx.in

@@ -0,0 +1 @@
+#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"

adm/qmake/custom.pri.template

@@ -0,0 +1,17 @@
+PRODUCTS_PATH = c:/3rdparty/vc14
+
+#CONFIG += HAVE_FREEIMAGE
+#CONFIG += HAVE_FFMPEG
+#CONFIG += HAVE_TBB
+#CONFIG += HAVE_GLES2
+#CONFIG += HAVE_D3D
+#CONFIG += HAVE_VTK
+
+aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
+aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
+
+INCLUDEPATH += $$aFreeType/include
+LIBS        += -L$$aFreeType/lib
+
+INCLUDEPATH += $$aTclTk/include
+LIBS        += -L$$aTclTk/lib

adm/scripts/.gitignore

@@ -0,0 +1,2 @@
+*custom.bat
+*custom.sh

adm/scripts/android_build.bat

@@ -0,0 +1,234 @@
+@echo OFF
+
+rem Auxiliary script for semi-automated building of OCCT for Android platform.
+rem android_custom.bat should be configured with paths
+rem to CMake, 3rd-parties, Android NDK and MinGW make tool.
+
+set "aCasSrc=%~dp0..\.."
+set "aBuildRoot=%aCasSrc%\work"
+
+set aNbJobs=%NUMBER_OF_PROCESSORS%
+
+rem Paths to 3rd-party tools and libraries
+set "anNdkPath="
+set "aFreeType="
+set "aRapidJson="
+
+rem Build stages to perform
+set "toCMake=1"
+set "toClean=0"
+set "toMake=1"
+set "toInstall=1"
+set "toPack=1"
+set "isStatic=0"
+
+rem Minimal Android platform and CPU architectures
+set "anNdkApiLevel=21"
+set "anNdkAbiList=armeabi-v7a x86 arm64-v8a x86_64"
+
+rem OCCT Modules to build
+set "BUILD_ModelingData=ON"
+set "BUILD_ModelingAlgorithms=ON"
+set "BUILD_Visualization=ON"
+set "BUILD_ApplicationFramework=ON"
+set "BUILD_DataExchange=ON"
+
+rem Optional 3rd-party libraries to enable
+set USE_RAPIDJSON=OFF
+
+rem Archive tool
+set "THE_7Z_PARAMS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on"
+set "THE_7Z_PATH=%ProgramW6432%\7-Zip\7z.exe"
+
+rem Configuration file
+if exist "%~dp0android_custom.bat" call "%~dp0android_custom.bat"
+
+set "aCompiler=gcc"
+set "aCppLib=gnustl_shared"
+if not exist "%anNdkPath%/sources/cxx-stl/gnu-libstdc++" (
+  if exist "%anNdkPath%/sources/cxx-stl/llvm-libc++" (
+    set "aCompiler=clang"
+    set "aCppLib=c++_shared"
+  )
+)
+set "aLibType=Shared"
+if ["%isStatic%"] == ["1"] set "aLibType=Static"
+set "aDestDir=%aBuildRoot%\android-%aCompiler%"
+
+set "anOcctVerSuffix="
+set "anOcctVersion=0.0.0"
+set "aGitBranch="
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aCasSrc%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
+for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
+
+for %%s in (%anNdkAbiList%) do (
+  call :cmakeGenerate "%anNdkApiLevel%" "%%s"
+)
+
+for /F "skip=1 delims=" %%F in ('
+  wmic PATH Win32_LocalTime GET Day^,Month^,Year /FORMAT:TABLE
+') do (
+  for /F "tokens=1-3" %%L in ("%%F") do (
+    set DAY00=0%%L
+    set MONTH00=0%%M
+    set YEAR=%%N
+  )
+)
+set DAY00=%DAY00:~-2%
+set MONTH00=%MONTH00:~-2%
+set "aRevision=-%YEAR%-%MONTH00%-%DAY00%"
+rem set "aRevision=-%aGitBranch%"
+set "anArchName=occt-%anOcctVersion%%anOcctVerSuffix%%aRevision%-android"
+set "aTarget=%aBuildRoot%\%anArchName%"
+if ["%toPack%"] == ["1"] (
+  echo Creating archive %anArchName%.7z
+  rmdir /S /Q "%aTarget%"
+  if not exist "%aTarget%" ( mkdir "%aTarget%" )
+  if exist "%aBuildRoot%/%anArchName%.7z" del "%aBuildRoot%/%anArchName%.7z"
+  xcopy /S /Y "%aDestDir%\*" "%aTarget%\"
+
+  "%THE_7Z_PATH%" a -r %THE_7Z_PARAMS% "%aBuildRoot%/%anArchName%.7z" "%aTarget%"
+)
+if not ["%1"] == ["-nopause"] (
+  pause
+)
+
+goto :eof
+
+:cmakeGenerate
+set "anApi=%~1"
+set "anAbi=%~2"
+set "aPlatformAndCompiler=android-%anAbi%-%aCompiler%"
+set "aWorkDir=%aBuildRoot%\%aPlatformAndCompiler%-make"
+set "aLogFile=%aBuildRoot%\build-%aPlatformAndCompiler%.log"
+if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )
+if     exist "%aLogFile%" ( del   "%aLogFile%" )
+
+rem include some information about OCCT into archive
+echo ^<pre^>> "%aWorkDir%\VERSION.html"
+git status >> "%aWorkDir%\VERSION.html"
+git log -n 100 >> "%aWorkDir%\VERSION.html"
+echo ^</pre^>>> "%aWorkDir%\VERSION.html"
+
+echo Start building OCCT for %aPlatformAndCompiler%
+echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile%
+
+pushd "%aWorkDir%"
+
+set "aTimeZERO=%TIME%"
+if ["%toCMake%"] == ["1"] (
+  echo Configuring OCCT for Android %anAbi%, API level %anApi%...
+  cmake -G "MinGW Makefiles" ^
+ -D CMAKE_SYSTEM_NAME:STRING="Android" ^
+ -D CMAKE_ANDROID_NDK="%anNdkPath%" ^
+ -D CMAKE_BUILD_TYPE:STRING="Release" ^
+ -D CMAKE_ANDROID_ARCH_ABI:STRING="%anAbi%" ^
+ -D CMAKE_SYSTEM_VERSION:STRING="%anApi%" ^
+ -D CMAKE_ANDROID_STL_TYPE="%aCppLib%" ^
+ -D BUILD_LIBRARY_TYPE:STRING="%aLibType%" ^
+ -D INSTALL_DIR:PATH="%aDestDir%" ^
+ -D INSTALL_DIR_INCLUDE:STRING="inc" ^
+ -D INSTALL_DIR_LIB:STRING="libs/%anAbi%" ^
+ -D INSTALL_DIR_CMAKE:STRING="libs/%anAbi%/cmake/opencascade" ^
+ -D INSTALL_DIR_RESOURCE:STRING="src" ^
+ -D BUILD_MODULE_FoundationClasses:BOOL="ON" ^
+ -D BUILD_MODULE_ModelingData:BOOL="%BUILD_ModelingData%" ^
+ -D BUILD_MODULE_ModelingAlgorithms:BOOL="%BUILD_ModelingAlgorithms%" ^
+ -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
+ -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
+ -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
+ -D BUILD_MODULE_Draw:BOOL="OFF" ^
+ -D BUILD_DOC_Overview:BOOL="OFF" ^
+ -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^
+ -D 3RDPARTY_FREETYPE_LIBRARY_DIR:PATH="%aFreeType%/libs/%anAbi%" ^
+ -D 3RDPARTY_FREETYPE_LIBRARY:FILEPATH="%aFreeType%/libs/%anAbi%/libfreetype.so" ^
+ -D USE_RAPIDJSON:BOOL="%USE_RAPIDJSON%" ^
+ -D 3RDPARTY_RAPIDJSON_DIR:PATH="%aRapidJson%" ^
+ -D 3RDPARTY_RAPIDJSON_INCLUDE_DIR:PATH="%aRapidJson%/include" ^
+ "%aCasSrc%"
+
+  if errorlevel 1 (
+    popd
+    exit /B 1
+    goto :eof
+  )
+)
+set aTimeGEN=%TIME%
+call :computeDuration %aTimeZERO% %aTimeGEN%
+if ["%toCMake%"] == ["1"] (
+  echo Generation time: %DURATION%
+  echo Generation time: %DURATION%>> "%aLogFile%"
+)
+
+if ["%toClean%"] == ["1"] (
+  mingw32-make clean
+)
+
+if ["%toMake%"] == ["1"] (
+  echo Building...
+  mingw32-make -j %aNbJobs% 2>> "%aLogFile%"
+  if errorlevel 1 (
+    type "%aLogFile%"
+    popd
+    exit /B 1
+    goto :eof
+  )
+  type "%aLogFile%"
+)
+set aTimeBUILD=%TIME%
+call :computeDuration %aTimeGEN% %aTimeBUILD%
+if ["%toMake%"] == ["1"] (
+  echo Building time: %DURATION%
+  echo Building time: %DURATION%>> "%aLogFile%"
+)
+call :computeDuration %aTimeZERO% %aTimeBUILD%
+if ["%toMake%"] == ["1"] (
+  echo Total building time: %DURATION%
+  echo Total building time: %DURATION%>> "%aLogFile%"
+)
+
+if ["%toInstall%"] == ["1"] (
+  echo Installing into %aDestDir%...
+  mingw32-make install 2>> "%aLogFile%"
+  copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html"
+)
+set "aTimeINSTALL=%TIME%"
+call :computeDuration "%aTimeBUILD%" "%aTimeINSTALL%"
+if ["%toInstall%"] == ["1"] (
+  echo Install time: %DURATION%
+  echo Install time: %DURATION%>> "%aLogFile%"
+)
+
+call :computeDuration "%aTimeZERO%" "%aTimeINSTALL%"
+echo Total time: %DURATION%
+echo Total time: %DURATION%>> "%aLogFile%"
+
+popd
+goto :eof
+
+:computeDuration
+set "aTimeFrom=%~1"
+set "aTimeEnd=%~2"
+rem handle time before 10AM (win10 - remove empty space at the beginning)
+if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%"
+if  "%aTimeEnd:~0,1%"==" " set  "aTimeEnd=%aTimeEnd:~1%"
+rem handle time before 10AM (win7 - add 0 at the beginning)
+if "%aTimeFrom:~1,1%"==":" set "aTimeFrom=0%aTimeFrom%"
+if  "%aTimeEnd:~1,1%"==":" set  "aTimeEnd=0%aTimeEnd%"
+rem convert hours:minutes:seconds:ms into duration
+set /A aTimeFrom=(1%aTimeFrom:~0,2%-100)*360000 + (1%aTimeFrom:~3,2%-100)*6000 + (1%aTimeFrom:~6,2%-100)*100 + (1%aTimeFrom:~9,2%-100)
+set /A  aTimeEnd= (1%aTimeEnd:~0,2%-100)*360000 +  (1%aTimeEnd:~3,2%-100)*6000 +  (1%aTimeEnd:~6,2%-100)*100 +  (1%aTimeEnd:~9,2%-100)
+set /A aDurTotalSec=%aTimeEnd%-%aTimeFrom%
+if %aTimeEnd% LSS %aTimeFrom% set set /A aDurTotalSec=%aTimeFrom%-%aTimeEnd%
+set /A aDurHH=%aDurTotalSec% / 360000
+set /A aDurMM=(%aDurTotalSec% - %aDurHH%*360000) / 6000
+set /A aDurSS=(%aDurTotalSec% - %aDurHH%*360000 - %aDurMM%*6000) / 100
+if %aDurHH% LSS 10 set aDurHH=0%aDurHH%
+if %aDurMM% LSS 10 set aDurMM=0%aDurMM%
+if %aDurSS% LSS 10 set aDurSS=0%aDurSS%
+
+set "DURATION=%aDurHH%:%aDurMM%:%aDurSS%"
+goto :eof

adm/scripts/android_custom.bat.template

@@ -0,0 +1,31 @@
+rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat)
+
+rem Paths to 3rd-party tools and libraries
+rem call c:\TDM-GCC-64\mingwvars.bat
+rem set "PATH=c:\CMake\bin;%PATH%"
+rem set "anNdkPath=c:/android-ndk-r12"
+rem set "aFreeType=c:/freetype-2.7.1-android"
+rem set "aRapidJson=c:/rapidjson-1.1.0"
+
+rem Uncomment to customize building steps
+rem set "aBuildRoot=%~dp0..\..\work"
+rem set "toCMake=1"
+rem set "toClean=0"
+rem set "toMake=1"
+rem set "toInstall=1"
+rem set "toPack=1"
+rem set "isStatic=0"
+
+rem Minimal Android platform and CPU architectures
+rem set "anNdkApiLevel=21"
+rem set "anNdkAbiList=arm64-v8a x86_64"
+
+rem OCCT Modules to build
+rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_Visualization=ON"
+rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_DataExchange=ON"
+
+rem Optional 3rd-party libraries to enable
+rem set USE_RAPIDJSON=ON

adm/scripts/cmake_custom.bat.template

@@ -0,0 +1,46 @@
+rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
+
+set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
+
+set VS=14
+set VSDATA=2015
+
+rem Leave VSPLATFORM empty to build for x86 platform
+set VSPLATFORM=Win64
+
+rem ------------------------------------
+rem Uncomment to customize building steps
+rem ------------------------------------
+
+rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
+rem set "INSTALL_DIR=%SrcRoot%\install"
+
+rem set BUILD_DOC_Overview=OFF
+rem set BUILD_Inspector=OFF
+rem set BUILD_LIBRARY_TYPE=Shared
+rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+rem set BUILD_WITH_DEBUG=OFF
+rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+rem set BUILD_USE_PCH=OFF
+
+rem Use semicolon-separated list of toolkits if you want to disable all modules
+rem  and build only some toolkits.
+rem set BUILD_ADDITIONAL_TOOLKITS=
+
+rem Set a directory recognized as a patch for OCCT.
+rem set BUILD_PATCH=
+
+rem set BUILD_MODULE_ApplicationFramework=ON
+rem set BUILD_MODULE_DataExchange=ON
+rem set BUILD_MODULE_Draw=ON
+rem set BUILD_MODULE_ModelingAlgorithms=ON
+rem set BUILD_MODULE_ModelingData=ON
+rem set BUILD_MODULE_Visualization=ON
+
+rem set USE_D3D=OFF
+rem set USE_FFMPEG=OFF
+rem set USE_FREEIMAGE=OFF
+rem set USE_GLES2=OFF
+rem set USE_RAPIDJSON=OFF
+rem set USE_TBB=OFF
+rem set USE_VTK=OFF

adm/scripts/cmake_custom.sh.template

@@ -0,0 +1,42 @@
+# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
+
+OCCT3RDPARTY="$SrcRoot/../3rdparty"
+FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
+
+# ------------------------------------
+# Uncomment to customize building steps
+# ------------------------------------
+
+#BUILD_DIR=build
+#INSTALL_DIR="$SrcRoot/install"
+
+#BUILD_DOC_Overview=OFF
+#BUILD_Inspector=OFF
+#BUILD_LIBRARY_TYPE=Shared
+#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+#BUILD_WITH_DEBUG=OFF
+#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+
+# Use semicolon-separated list of toolkits if you want to disable all modules
+#  and build only some toolkits.
+#BUILD_ADDITIONAL_TOOLKITS=
+
+# Set a directory recognized as a patch for OCCT.
+#BUILD_PATCH=
+
+#BUILD_MODULE_ApplicationFramework=ON
+#BUILD_MODULE_DataExchange=ON
+#BUILD_MODULE_Draw=ON
+#BUILD_MODULE_ModelingAlgorithms=ON
+#BUILD_MODULE_ModelingData=ON
+#BUILD_MODULE_Visualization=ON
+
+#USE_FFMPEG=OFF
+#USE_FREEIMAGE=OFF
+#USE_GLES2=OFF
+#USE_RAPIDJSON=OFF
+#USE_TBB=OFF
+#USE_VTK=OFF
+
+# This is to add any additional arguments to cmake
+#AUX_ARGS=

adm/scripts/cmake_gen.bat

@@ -0,0 +1,83 @@
+@echo off
+
+rem Auxiliary script for semi-automated building of OCCT using cmake.
+rem cmake_custom.bat should be configured with VS version and path to 3rd-parties.
+rem OCCT3RDPARTY must be specified as mandatory dependency.
+
+setlocal
+
+set "SrcRoot=%~dp0..\.."
+
+set VS=14
+set VSDATA=2015
+set VSPLATFORM=Win64
+set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
+set "INSTALL_DIR=%SrcRoot%\install"
+
+set BUILD_ADDITIONAL_TOOLKITS=
+set BUILD_DOC_Overview=OFF
+set BUILD_Inspector=OFF
+set BUILD_LIBRARY_TYPE=Shared
+set BUILD_PATCH=
+set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+set BUILD_WITH_DEBUG=OFF
+set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+set BUILD_USE_PCH=OFF
+
+set BUILD_MODULE_ApplicationFramework=ON
+set BUILD_MODULE_DataExchange=ON
+set BUILD_MODULE_Draw=ON
+set BUILD_MODULE_ModelingAlgorithms=ON
+set BUILD_MODULE_ModelingData=ON
+set BUILD_MODULE_Visualization=ON
+
+set USE_D3D=OFF
+set USE_FFMPEG=OFF
+set USE_FREEIMAGE=OFF
+set USE_GLES2=OFF
+set USE_RAPIDJSON=OFF
+set USE_TBB=OFF
+set USE_VTK=OFF
+
+if exist "%~dp0cmake_custom.bat" call "%~dp0cmake_custom.bat"
+
+if not "%VSPLATFORM%"=="" set "arch_compile=Visual Studio %VS% %VSDATA% %VSPLATFORM%"
+if     "%VSPLATFORM%"=="" set "arch_compile=Visual Studio %VS% %VSDATA%"
+
+set "INSTALL_DIR=%INSTALL_DIR:\=/%"
+set "OCCT3RDPARTY=%OCCT3RDPARTY:\=/%"
+
+set "BUILD_DIR=%SrcRoot%\%BUILD_DIR%"
+if not exist "%BUILD_DIR%" mkdir "%BUILD_DIR%"
+pushd "%BUILD_DIR%"
+ 
+cmake -G "%arch_compile%" ^
+  -D 3RDPARTY_DIR:STRING="%OCCT3RDPARTY%" ^
+  -D BUILD_ADDITIONAL_TOOLKITS:STRING="%BUILD_ADDITIONAL_TOOLKITS%" ^
+  -D BUILD_DOC_Overview:BOOL=%BUILD_DOC_Overview% ^
+  -D BUILD_Inspector:BOOL=%BUILD_Inspector% ^
+  -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^
+  -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^
+  -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^
+  -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^
+  -D BUILD_MODULE_FoundationClasses:BOOL=ON ^
+  -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^
+  -D BUILD_MODULE_ModelingData:BOOL=%BUILD_MODULE_ModelingData% ^
+  -D BUILD_MODULE_Visualization:BOOL=%BUILD_MODULE_Visualization% ^
+  -D BUILD_PATCH:PATH="%BUILD_PATCH%" ^
+  -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=%BUILD_RELEASE_DISABLE_EXCEPTIONS% ^
+  -D BUILD_WITH_DEBUG:BOOL=%BUILD_WITH_DEBUG% ^
+  -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=%BUILD_ENABLE_FPE_SIGNAL_HANDLER% ^
+  -D BUILD_USE_PCH:BOOL=%BUILD_USE_PCH% ^
+  -D INSTALL_DIR:PATH="%INSTALL_DIR%" ^
+  -D USE_D3D:BOOL=%USE_D3D% ^
+  -D USE_FFMPEG:BOOL=%USE_FFMPEG% ^
+  -D USE_FREEIMAGE:BOOL=%USE_FREEIMAGE% ^
+  -D USE_GLES2:BOOL=%USE_GLES2% ^
+  -D USE_RAPIDJSON:BOOL=%USE_RAPIDJSON% ^
+  -D USE_TBB:BOOL=%USE_TBB% ^
+  -D USE_VTK:BOOL=%USE_VTK% ^
+  "%SrcRoot%"
+
+popd
+endlocal

adm/scripts/cmake_gen.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Auxiliary script for semi-automated building of OCCT using cmake.
+# cmake_custom.sh should be configured with path to 3rd-parties.
+# OCCT3RDPARTY and FREETYPE_DIR must be specified as mandatory dependencies.
+
+ScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+SrcRoot="${ScriptDir}/../.."
+
+INSTALL_DIR="$SrcRoot/install"
+
+BUILD_DIR=build
+DEB=
+CMAKE_BUILD_TYPE=Release
+if [ "$1" = "-d" ]; then
+  DEB=d
+  BUILD_DIR=${BUILD_DIR}-deb
+  CMAKE_BUILD_TYPE=Debug
+fi
+INSTALL_DIR_BIN=lin64/gcc/bin$DEB
+INSTALL_DIR_LIB=lin64/gcc/lib$DEB
+
+BUILD_ADDITIONAL_TOOLKITS=
+BUILD_DOC_Overview=OFF
+BUILD_Inspector=OFF
+BUILD_LIBRARY_TYPE=Shared
+BUILD_PATCH=
+BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+BUILD_WITH_DEBUG=OFF
+BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+
+BUILD_MODULE_ApplicationFramework=ON
+BUILD_MODULE_DataExchange=ON
+BUILD_MODULE_Draw=ON
+BUILD_MODULE_ModelingAlgorithms=ON
+BUILD_MODULE_ModelingData=ON
+BUILD_MODULE_Visualization=ON
+
+USE_FFMPEG=OFF
+USE_FREEIMAGE=OFF
+USE_GLES2=OFF
+USE_RAPIDJSON=OFF
+USE_TBB=OFF
+USE_VTK=OFF
+AUX_ARGS=
+
+if [ -f "${ScriptDir}/cmake_custom.sh" ]; then
+  . "${ScriptDir}/cmake_custom.sh"
+fi
+
+BUILD_DIR="$SrcRoot/$BUILD_DIR"
+if [ ! -d "$BUILD_DIR" ]; then mkdir -p "$BUILD_DIR"; fi
+pushd "$BUILD_DIR"
+ 
+cmake -G "Unix Makefiles" \
+  -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
+  -D 3RDPARTY_DIR:PATH="$OCCT3RDPARTY" \
+  -D 3RDPARTY_FREETYPE_DIR:PATH="$FREETYPE_DIR" \
+  -D BUILD_ADDITIONAL_TOOLKITS:STRING="$BUILD_ADDITIONAL_TOOLKITS" \
+  -D BUILD_DOC_Overview:BOOL=$BUILD_DOC_Overview \
+  -D BUILD_Inspector:BOOL=$BUILD_Inspector \
+  -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \
+  -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \
+  -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \
+  -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \
+  -D BUILD_MODULE_FoundationClasses:BOOL=ON \
+  -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \
+  -D BUILD_MODULE_ModelingData:BOOL=$BUILD_MODULE_ModelingData \
+  -D BUILD_MODULE_Visualization:BOOL=$BUILD_MODULE_Visualization \
+  -D BUILD_PATCH:PATH="$BUILD_PATCH" \
+  -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=$BUILD_RELEASE_DISABLE_EXCEPTIONS \
+  -D BUILD_WITH_DEBUG:BOOL=$BUILD_WITH_DEBUG \
+  -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=$BUILD_ENABLE_FPE_SIGNAL_HANDLER \
+  -D INSTALL_DIR:PATH="$INSTALL_DIR" \
+  -D INSTALL_DIR_LAYOUT:STRING=Windows \
+  -D INSTALL_DIR_BIN:STRING=$INSTALL_DIR_BIN \
+  -D INSTALL_DIR_LIB:STRING=$INSTALL_DIR_LIB \
+  -D USE_FFMPEG:BOOL=$USE_FFMPEG \
+  -D USE_FREEIMAGE:BOOL=$USE_FREEIMAGE \
+  -D USE_GLES2:BOOL=$USE_GLES2 \
+  -D USE_RAPIDJSON:BOOL=$USE_RAPIDJSON \
+  -D USE_TBB:BOOL=$USE_TBB \
+  -D USE_VTK:BOOL=$USE_VTK \
+  $AUX_ARGS "$SrcRoot"
+
+popd

adm/scripts/wasm_build.bat

@@ -0,0 +1,165 @@
+@echo OFF
+
+rem Auxiliary script for semi-automated building of OCCT for WASM platform.
+rem wasm_custom.bat should be configured with paths to CMake, 3rd-parties and Emscripten SDK.
+rem FreeType should be specified as mandatory dependency.
+
+set "aSrcRoot=%~dp0..\.."
+set "aBuildRoot=work"
+
+set aNbJobs=%NUMBER_OF_PROCESSORS%
+
+set "toCMake=1"
+set "toClean=0"
+set "toMake=1"
+set "toInstall=1"
+
+set "BUILD_ModelingData=ON"
+set "BUILD_ModelingAlgorithms=ON"
+set "BUILD_Visualization=ON"
+set "BUILD_ApplicationFramework=ON"
+set "BUILD_DataExchange=ON"
+
+rem Configuration file
+if exist "%~dp0wasm_custom.bat" call "%~dp0wasm_custom.bat"
+
+call "%EMSDK_ROOT%\emsdk_env.bat"
+set "aToolchain=%EMSDK%/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+
+set "anOcctVerSuffix="
+set "anOcctVersion=0.0.0"
+set "aGitBranch="
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_DEVELOPMENT" "%aSrcRoot%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVerSuffix=%%i" )
+for /f tokens^=2^ delims^=^" %%i in ('findstr /b /c:"#define OCC_VERSION_COMPLETE" "%aSrcRoot%\src\Standard\Standard_Version.hxx"') do ( set "anOcctVersion=%%i" )
+for /f %%i in ('git symbolic-ref --short HEAD') do ( set "aGitBranch=%%i" )
+
+call :cmakeGenerate
+if not ["%1"] == ["-nopause"] (
+  pause
+)
+
+goto :eof
+
+:cmakeGenerate
+set "aPlatformAndCompiler=wasm"
+set "aWorkDir=%aSrcRoot%\%aBuildRoot%\%aPlatformAndCompiler%-make"
+set "aDestDir=%aSrcRoot%\%aBuildRoot%\%aPlatformAndCompiler%"
+set "aLogFile=%aSrcRoot%\%aBuildRoot%\build-%aPlatformAndCompiler%.log"
+if not exist "%aWorkDir%" ( mkdir "%aWorkDir%" )
+if     exist "%aLogFile%" ( del   "%aLogFile%" )
+
+rem include some information about OCCT into archive
+echo ^<pre^>> "%aWorkDir%\VERSION.html"
+git status >> "%aWorkDir%\VERSION.html"
+git log -n 100 >> "%aWorkDir%\VERSION.html"
+echo ^</pre^>>> "%aWorkDir%\VERSION.html"
+
+echo Start building OCCT for %aPlatformAndCompiler%
+echo Start building OCCT for %aPlatformAndCompiler%>> %aLogFile%
+
+pushd "%aWorkDir%"
+
+set aTimeZERO=%TIME%
+if ["%toCMake%"] == ["1"] (
+  echo "Configuring OCCT for WASM..."
+  cmake -G "MinGW Makefiles" ^
+ -D CMAKE_TOOLCHAIN_FILE:FILEPATH="%aToolchain%" ^
+ -D CMAKE_BUILD_TYPE:STRING="Release" ^
+ -D BUILD_LIBRARY_TYPE:STRING="Static" ^
+ -D INSTALL_DIR:PATH="%aDestDir%" ^
+ -D INSTALL_DIR_INCLUDE:STRING="inc" ^
+ -D INSTALL_DIR_RESOURCE:STRING="src" ^
+ -D 3RDPARTY_FREETYPE_DIR:PATH="%aFreeType%" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="%aFreeType%/include" ^
+ -D 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="%aFreeType%/include" ^
+ -D BUILD_MODULE_FoundationClasses:BOOL="ON" ^
+ -D BUILD_MODULE_ModelingData:BOOL="%BUILD_ModelingData%" ^
+ -D BUILD_MODULE_ModelingAlgorithms:BOOL="%BUILD_ModelingAlgorithms%" ^
+ -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
+ -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
+ -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
+ -D BUILD_MODULE_Draw:BOOL="OFF" ^
+ -D BUILD_DOC_Overview:BOOL="OFF" ^
+ "%aSrcRoot%"
+
+  if errorlevel 1 (
+    popd
+    exit /B 1
+    goto :eof
+  )
+)
+set aTimeGEN=%TIME%
+call :computeDuration %aTimeZERO% %aTimeGEN%
+if ["%toCMake%"] == ["1"] (
+  echo Generation time: %DURATION%
+  echo Generation time: %DURATION%>> "%aLogFile%"
+)
+
+if "%toClean%"=="1" (
+  mingw32-make clean
+)
+
+if "%toMake%"=="1" (
+  echo Building...
+  mingw32-make -j %aNbJobs% 2>> "%aLogFile%"
+  if errorlevel 1 (
+    popd
+    exit /B 1
+    goto :eof
+  )
+  type "%aLogFile%"
+)
+set aTimeBUILD=%TIME%
+call :computeDuration %aTimeGEN% %aTimeBUILD%
+if "%toMake%"=="1" (
+  echo Building time: %DURATION%
+  echo Building time: %DURATION%>> "%aLogFile%"
+)
+call :computeDuration %aTimeZERO% %aTimeBUILD%
+if "%toMake%"=="1" (
+  echo Total building time: %DURATION%
+  echo Total building time: %DURATION%>> "%aLogFile%"
+)
+
+if "%toInstall%"=="1" (
+  echo Installing into %aDestDir%...
+  mingw32-make install 2>> "%aLogFile%"
+  copy /Y "%aWorkDir%\VERSION.html" "%aDestDir%\VERSION.html"
+)
+set aTimeINSTALL=%TIME%
+call :computeDuration %aTimeBUILD% %aTimeINSTALL%
+if "%toInstall%"=="1" (
+  echo Install time: %DURATION%
+  echo Install time: %DURATION%>> "%aLogFile%"
+)
+
+call :computeDuration %aTimeZERO% %aTimeINSTALL%
+echo Total time: %DURATION%
+echo Total time: %DURATION%>> "%aLogFile%"
+
+popd
+goto :eof
+
+:computeDuration
+set aTimeFrom=%1
+set aTimeEnd=%2
+rem handle time before 10AM (win10 - remove empty space at the beginning)
+if "%aTimeFrom:~0,1%"==" " set "aTimeFrom=%aTimeFrom:~1%"
+if  "%aTimeEnd:~0,1%"==" " set  "aTimeEnd=%aTimeEnd:~1%"
+rem handle time before 10AM (win7 - add 0 at the beginning)
+if "%aTimeFrom:~1,1%"==":" set "aTimeFrom=0%aTimeFrom%"
+if  "%aTimeEnd:~1,1%"==":" set  "aTimeEnd=0%aTimeEnd%"
+rem convert hours:minutes:seconds:ms into duration
+set /A aTimeFrom=(1%aTimeFrom:~0,2%-100)*360000 + (1%aTimeFrom:~3,2%-100)*6000 + (1%aTimeFrom:~6,2%-100)*100 + (1%aTimeFrom:~9,2%-100)
+set /A  aTimeEnd= (1%aTimeEnd:~0,2%-100)*360000 +  (1%aTimeEnd:~3,2%-100)*6000 +  (1%aTimeEnd:~6,2%-100)*100 +  (1%aTimeEnd:~9,2%-100)
+set /A aDurTotalSec=%aTimeEnd%-%aTimeFrom%
+if %aTimeEnd% LSS %aTimeFrom% set set /A aDurTotalSec=%aTimeFrom%-%aTimeEnd%
+set /A aDurHH=%aDurTotalSec% / 360000
+set /A aDurMM=(%aDurTotalSec% - %aDurHH%*360000) / 6000
+set /A aDurSS=(%aDurTotalSec% - %aDurHH%*360000 - %aDurMM%*6000) / 100
+if %aDurHH% LSS 10 set aDurHH=0%aDurHH%
+if %aDurMM% LSS 10 set aDurMM=0%aDurMM%
+if %aDurSS% LSS 10 set aDurSS=0%aDurSS%
+
+set "DURATION=%aDurHH%:%aDurMM%:%aDurSS%"
+goto :eof

adm/scripts/wasm_build.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Auxiliary script for semi-automated building of OCCT for WASM platform.
+# wasm_custom.sh should be configured with paths to CMake, 3rd-parties and Emscripten SDK.
+# FreeType should be specified as mandatory dependency.
+
+export aScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+export aSrcRoot="${aScriptDir}/../.."
+export aBuildRoot=work
+
+export aNbJobs=${NUMBER_OF_PROCESSORS}
+
+export toCMake=1
+export toClean=0
+export toMake=1
+export toInstall=1
+
+export BUILD_ModelingData=ON
+export BUILD_ModelingAlgorithms=ON
+export BUILD_Visualization=ON
+export BUILD_ApplicationFramework=ON
+export BUILD_DataExchange=ON
+
+if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
+  . "${aScriptDir}/wasm_custom.sh"
+fi
+
+. "${EMSDK_ROOT}/emsdk_env.sh"
+
+export aToolchain="${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+
+export aGitBranch=`git symbolic-ref --short HEAD`
+
+echo "Compilation OCCT branch : $aGitBranch"
+
+export aPlatformAndCompiler=wasm
+
+export aWorkDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}-make"
+if [ ! -d "${aWorkDir}" ]; then
+  mkdir -p "${aWorkDir}"
+fi
+
+export aDestDir="${aSrcRoot}/${aBuildRoot}/${aPlatformAndCompiler}"
+if [ ! -d "${aDestDir}" ]; then
+  mkdir -p "${aDestDir}"
+fi
+
+export aLogFile="${aSrcRoot}/${aBuildRoot}/build-${aPlatformAndCompiler}.log"
+if [ -f "${aLogFile}" ]; then
+  rm "${aLogFile}"
+fi
+
+echo Start building OCCT for ${aPlatformAndCompiler}
+echo Start building OCCT for ${aPlatformAndCompiler}>> "${aLogFile}"
+
+pushd "${aWorkDir}"
+pwd
+echo toCMake=${toCMake}
+if [ "${toCMake}" = "1" ]; then
+
+echo "Configuring OCCT for WASM..."
+echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
+-DCMAKE_BUILD_TYPE:STRING="Release" \
+-DBUILD_LIBRARY_TYPE:STRING="Static" \
+-DINSTALL_DIR:PATH="${aDestDir}" \
+-DINSTALL_DIR_INCLUDE:STRING="inc" \
+-DINSTALL_DIR_RESOURCE:STRING="src" \
+-D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
+-DBUILD_MODULE_FoundationClasses:BOOL="ON" \
+-DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
+-DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \
+-DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
+-DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
+-DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+-DBUILD_MODULE_Draw:BOOL="OFF" \
+-DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
+
+cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
+-DCMAKE_BUILD_TYPE:STRING="Release" \
+-DBUILD_LIBRARY_TYPE:STRING="Static" \
+-DINSTALL_DIR:PATH="${aDestDir}" \
+-DINSTALL_DIR_INCLUDE:STRING="inc" \
+-DINSTALL_DIR_RESOURCE:STRING="src" \
+-D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \
+-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \
+-DBUILD_MODULE_FoundationClasses:BOOL="ON" \
+-DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \
+-DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \
+-DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
+-DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
+-DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
+-DBUILD_MODULE_Draw:BOOL="OFF" \
+-DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"
+
+  if [ $? -ne 0 ]; then
+    echo "Problem during configuration"
+    popd
+    exit 1
+  fi
+
+fi
+
+if [ "${toClean}" = "1" ]; then
+  make clean
+fi
+
+if [ "${toMake}" = "1" ]; then
+  echo Building...
+  make -j ${aNbJobs} 2>> "${aLogFile}"
+  if [ $? -ne 0 ]; then
+    echo "Problem during make operation"
+    popd
+    exit 1
+  fi
+  echo "${aLogFile}"
+fi
+
+if [ "${toInstall}" = "1" ]; then
+  echo Installing into ${aDestDir}
+  make install 2>> "${aLogFile}"
+fi
+
+popd

adm/scripts/wasm_custom.bat.template

@@ -0,0 +1,16 @@
+rem Environment configuration template for occ_build_wasm.bat (to be renamed as wasm_custom_env.bat)
+set "aFreeType=%aSrcRoot%\..\3rdparty\freetype-2.7.1-wasm"
+set "EMSDK_ROOT=%aSrcRoot%\..\emsdk"
+
+rem Uncomment to customize building steps
+rem set "aBuildRoot=work"
+rem set "toCMake=1"
+rem set "toClean=0"
+rem set "toMake=1"
+rem set "toInstall=1"
+
+rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_Visualization=ON"
+rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_DataExchange=ON"

adm/scripts/wasm_custom.sh.template

@@ -0,0 +1,16 @@
+# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
+export EMSDK_ROOT="$aSrcRoot/../emsdk"
+
+# Uncomment to customize building steps
+#export aBuildRoot=work
+#export toCMake=1
+#export toClean=0
+#export toMake=1
+#export toInstall=1
+
+#export BUILD_ModelingData=ON
+#export BUILD_ModelingAlgorithms=ON
+#export BUILD_Visualization=ON
+#export BUILD_ApplicationFramework=ON
+#export BUILD_DataExchange=ON

adm/templates/OpenCASCADEConfig.cmake.in

@@ -21,6 +21,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
 # This is made to support different locations of CMake files:
 # - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
 # - in Windows style: $INSTALL_DIR/cmake
+# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
 get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
 get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
 if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
@@ -29,6 +30,10 @@ endif()
 if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
   get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
 endif()
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+endif()
 
 # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
 set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")

adm/templates/build.bat

@@ -0,0 +1,38 @@
+@echo off
+setlocal
+
+rem Setup environment
+call "%~dp0env.bat" %1 %2 %3
+
+rem Define path to project file
+set "PRJFILE=%~dp0OCCT.sln"
+
+if "%VCVER%" == "vc8" (
+  call "%VS80COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc9" (
+  call "%VS90COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc10" (
+  call "%VS100COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc11" (
+  call "%VS110COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc12" (
+  call "%VS120COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc14" (
+  call "%VS140COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc141" (
+  call "%VS141COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc142" (
+  call "%VS142COMNTOOLS%/vsvars32.bat" > nul
+) else (
+  echo Error: wrong VS identifier
+  exit /B
+)
+
+set BUILDCONFIG=Release
+if "%CASDEB%"=="i" set BUILDCONFIG=RelWithDebInfo
+if "%CASDEB%"=="d" set BUILDCONFIG=Debug
+if "%ARCH%"=="32" set PLATFORM=win32
+if "%ARCH%"=="64" set PLATFORM=x64
+
+msbuild "%PRJFILE%" /m /fl /flp:LogFile="build_%BUILDCONFIG%.log" /p:Configuration=%BUILDCONFIG% /p:Platform=%PLATFORM% /p:BuildProjectReferences=false
+endlocal

adm/templates/codeblocks.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
+# This file has been generated by genproj.tcl script from CASROOT/adm/templates/codeblocks.sh
 
 export TARGET="cbp"
 
 source ./env.sh "$1" "$TARGET"
 
 if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
-  /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+  /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
 else
-  codeblocks ./adm/$WOKSTATION/cbp/OCCT.workspace
+  codeblocks ./adm/$WOKSTATION/cbp/__SOLUTION__.workspace
 fi

adm/templates/custom.build.bat.in

@@ -14,6 +14,7 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
     set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
+    set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"
 
     if not "@3RDPARTY_QT_DIR@" == "" (
       set "QTDIR=@3RDPARTY_QT_DIR@"

adm/templates/custom.install.bat.in

@@ -10,12 +10,13 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
     set "TK_DIR=@USED_3RDPARTY_TK_DIR@"
     set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
-    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
+    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
     set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
     set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
     set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
     set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
     set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
+    set "OPENVR_DIR=@USED_3RDPARTY_OPENVR_DIR@"
 
     if not "@USED_3RDPARTY_QT_DIR@" == "" (
       set "QTDIR=@USED_3RDPARTY_QT_DIR@"

adm/templates/env.bat

@@ -24,11 +24,15 @@ set "HAVE_GLES2=false"
 set "HAVE_D3D=false"
 set "HAVE_ZLIB=false"
 set "HAVE_LIBLZMA=false"
+set "HAVE_RAPIDJSON=false"
+set "HAVE_OPENVR=false"
+set "HAVE_E57=false"
 set "CSF_OPT_INC="
 set "CSF_OPT_LIB32="
 set "CSF_OPT_LIB64="
 set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
+set "CSF_DEFINES=%CSF_DEFINES_EXTRA%"
 
 if not ["%CASROOT%"] == [""] if exist "%SCRIPTROOT%\%CASROOT%" set "CASROOT=%SCRIPTROOT%\%CASROOT%"
 if     ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
@@ -74,6 +78,9 @@ if "%VCVER:~-4%" == "-uwp" (
   set VCLIB=%VCLIB%-uwp
   set VCPROP=Universal
 )
+if "%VCFMT%" == "vclang" (
+  set VCLIB=vc14
+)
 rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
 
 rem ----- Parsing of Visual Studio platform -----
@@ -99,6 +106,14 @@ if not "%DevEnvDir%" == "" (
   for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
     set "DevEnvDir=%%i\Common7\IDE\"
   )
+) else if /I "%VCFMT%" == "vc142" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "DevEnvDir=%%i\Common7\IDE\"
+  )
+) else if /I "%VCFMT%" == "vclang" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "DevEnvDir=%%i\Common7\IDE\"
+  )
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (
@@ -110,6 +125,8 @@ if not "%DevEnvDir%" == "" (
   echo vc12  = VS 2013 ^(SP3^)
   echo vc14  = VS 2015
   echo vc141 = VS 2017
+  echo vc142 = VS 2019
+  echo vclang = VS 2019 with ClangCL toolset
   exit /B
 )
 
@@ -134,6 +151,16 @@ if /I "%VCFMT%" == "vc9" (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   )
   set "VCPlatformToolSet=v141"
+) else if /I "%VCFMT%" == "vc142" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  ) 
+  set "VCPlatformToolSet=v142"
+) else if /I "%VCFMT%" == "vclang" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  ) 
+  set "VCPlatformToolSet=ClangCL"
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (
@@ -162,6 +189,9 @@ if ["%HAVE_GLES2%"]     == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DH
 if ["%HAVE_D3D%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_D3D"       & set "CSF_DEFINES=HAVE_D3D;%CSF_DEFINES%"
 if ["%HAVE_ZLIB%"]      == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_ZLIB"      & set "CSF_DEFINES=HAVE_ZLIB;%CSF_DEFINES%"
 if ["%HAVE_LIBLZMA%"]   == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_LIBLZMA"   & set "CSF_DEFINES=HAVE_LIBLZMA;%CSF_DEFINES%"
+if ["%HAVE_RAPIDJSON%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_RAPIDJSON" & set "CSF_DEFINES=HAVE_RAPIDJSON;%CSF_DEFINES%"
+if ["%HAVE_OPENVR%"]    == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENVR"    & set "CSF_DEFINES=HAVE_OPENVR;%CSF_DEFINES%"
+if ["%HAVE_E57%"]       == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_E57"       & set "CSF_DEFINES=HAVE_E57;%CSF_DEFINES%"
 
 rem Eliminate VS warning
 if ["%CSF_DEFINES%"]  == [""] set "CSF_DEFINES=;"

adm/templates/env.bat.in

@@ -70,6 +70,10 @@ if not "%DevEnvDir%" == "" (
   for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
     set "DevEnvDir=%%i\Common7\IDE\"
   )
+) else if /I "%VCFMT%" == "vc142" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "DevEnvDir=%%i\Common7\IDE\"
+  )  
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (
@@ -98,6 +102,11 @@ if /I "%VCFMT%" == "vc9" (
     set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
   )
   set "VCPlatformToolSet=v141"
+) else if /I "%VCFMT%" == "vc142" (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  ) 
+  set "VCPlatformToolSet=v142"
 ) else if /I "%VCFMT%" == "gcc" (
   rem MinGW
 ) else (
@@ -110,12 +119,14 @@ rem ----- For compatability with external application using CASROOT -----
 if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
 
 rem ----- Define path to 3rdparty products -----
-set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
+if ["%THIRDPARTY_DIR%"] == [""] set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
 
 if ["%ARCH%"] == ["32"] set VCARCH=x86
 if ["%ARCH%"] == ["64"] set VCARCH=amd64
 
 if /I ["%1"] == ["vc141"] set "VCVER=vc14"
+if /I ["%1"] == ["vc142"] set "VCVER=vc14"
+
 if exist "%CASROOT%\custom.bat" (
   call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%
 )
@@ -129,7 +140,11 @@ if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
 if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
-if not ["%QTDIR%"] == [""]             set "PATH=%QTDIR%/bin;%PATH%"
+if not ["%OPENVR_DIR%"] == [""]        set "PATH=%OPENVR_DIR%;%PATH%"
+if not ["%QTDIR%"] == [""] (
+  set "PATH=%QTDIR%/bin;%PATH%"
+  set "QT_PLUGIN_PATH=%QTDIR%/plugins"
+)
 
 rem ----- Set path to 3rd party and OCCT libraries -----
 if not "%CSF_OCCTBinPath%" == "" (

adm/templates/env.install.sh.in

@@ -8,7 +8,9 @@ if [ "${CASROOT}" == "" ]; then
 fi
 
 # ----- Define path to 3rdparty products -----
-export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+if [ "${THIRDPARTY_DIR}" == "" ]; then
+  export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+fi
 
 # ----- Read script arguments -----
 shopt -s nocasematch

adm/templates/env.samples.bat.in

@@ -6,6 +6,7 @@ if exist "%~dp0custom.bat" (
 
 call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
 if /I ["%1"] == ["vc141"] set "VCVER=vc141"
+if /I ["%1"] == ["vc142"] set "VCVER=vc142"
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 set "LIB_DIR=win%ARCH%\%VCVER%\libd"
 
@@ -26,3 +27,5 @@ if not "%QTDIR%" == "" (
   set "PATH=%QTDIR%/bin;%PATH%"
   set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
 )
+
+set "CSF_OCCTOverviewSampleCodePath=%~dp0..\..\OCCTOverview\code"

adm/templates/env.samples.sh.in

@@ -20,3 +20,5 @@ export STATION=$host
 export RES_DIR=${aSamplePath}/${STATION}/res
 
 export PATH=${QTDIR}/bin:${PATH}
+
+export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code"

adm/templates/env.sh

@@ -6,7 +6,7 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath
 # Reset values
 export CASROOT="__CASROOT__"
 export CASDEB=""
-export TARGET="";
+export PRJFMT="";
 export HAVE_TBB="false";
 export HAVE_OPENCL="false";
 export HAVE_FREEIMAGE="false";
@@ -15,6 +15,9 @@ export HAVE_VTK="false";
 export HAVE_GLES2="false";
 export HAVE_ZLIB="false";
 export HAVE_LIBLZMA="false";
+export HAVE_RAPIDJSON="false";
+export HAVE_OPENVR="false";
+export HAVE_E57="false";
 export MACOSX_USE_GLX="false";
 export CSF_OPT_INC=""
 export CSF_OPT_LIB32=""
@@ -40,9 +43,9 @@ do
   elif [ "$i" == "i" ] || [ "$i" == "relwithdeb" ]; then
     export CASDEB="i"
   elif [ "$i" == "cbp" ]; then
-    export TARGET="cbp";
+    export PRJFMT="cbp";
   elif [ "$i" == "xcd" ] || [ "$i" == "xcode" ]; then
-    export TARGET="xcd";
+    export PRJFMT="xcd";
   fi
 done
 shopt -u nocasematch
@@ -64,28 +67,32 @@ else
 fi
 
 export CASBIN=""
-if [ "${TARGET}" == "cbp" ]; then
-  export CASBIN="${WOKSTATION}/cbp"
-elif [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   export CASBIN="adm/mac/xcd/build"
+else
+  if [ "$aSystem" == "Darwin" ]; then
+    export CASBIN="${WOKSTATION}/clang"
+  else
+    export CASBIN="${WOKSTATION}/gcc"
+  fi
 fi
 
 export CSF_OPT_INC="${CSF_OPT_INC}:${CASROOT}/inc"
 
-if [ "${TARGET}" == "cbp" ]; then
-  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
-  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
-  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
-  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
-  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
-  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
-elif [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Debug"
   export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Debug"
   export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/Release"
   export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/Release"
   export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/RelWithDebInfo"
   export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/RelWithDebInfo"
+else
+  export CSF_OPT_LIB32D="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB64D="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libd"
+  export CSF_OPT_LIB32="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB64="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/lib"
+  export CSF_OPT_LIB32I="${CSF_OPT_LIB32}:${CASROOT}/${CASBIN}/libi"
+  export CSF_OPT_LIB64I="${CSF_OPT_LIB64}:${CASROOT}/${CASBIN}/libi"
 fi
 
 export CSF_OPT_CMPL=""
@@ -99,6 +106,9 @@ if [ "$HAVE_GLES2"     == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
 if [ "$HAVE_VTK"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
 if [ "$HAVE_ZLIB"      == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
 if [ "$HAVE_LIBLZMA"   == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_LIBLZMA"; fi
+if [ "$HAVE_RAPIDJSON" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_RAPIDJSON"; fi
+if [ "$HAVE_OPENVR"    == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENVR"; fi
+if [ "$HAVE_E57"       == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_E57"; fi
 # Option to compile OCCT with X11 libs on Mac OS X
 if [ "$MACOSX_USE_GLX" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DMACOSX_USE_GLX"; fi
 
@@ -174,7 +184,7 @@ export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
 export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
 export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
 
-if [ "${TARGET}" == "xcd" ]; then
+if [ "${PRJFMT}" == "xcd" ]; then
   if [ "${CASDEB}" == "d" ]; then
     export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
   else

adm/templates/install.bat

@@ -0,0 +1,38 @@
+@echo off
+setlocal
+
+rem Setup environment
+call "%~dp0env.bat" %1 %2 %3
+
+rem Define path to project file
+set "PRJFILE=%~dp0INSTALL.vcxproj"
+
+if "%VCVER%" == "vc8" (
+  call "%VS80COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc9" (
+  call "%VS90COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc10" (
+  call "%VS100COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc11" (
+  call "%VS110COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc12" (
+  call "%VS120COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc14" (
+  call "%VS140COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc141" (
+  call "%VS141COMNTOOLS%/vsvars32.bat" > nul
+) else if "%VCVER%" == "vc142" (
+  call "%VS142COMNTOOLS%/vsvars32.bat" > nul
+) else (
+  echo Error: wrong VS identifier
+  exit /B
+)
+
+set BUILDCONFIG=Release
+if "%CASDEB%"=="i" set BUILDCONFIG=RelWithDebInfo
+if "%CASDEB%"=="d" set BUILDCONFIG=Debug
+if "%ARCH%"=="32" set PLATFORM=win32
+if "%ARCH%"=="64" set PLATFORM=x64
+
+msbuild "%PRJFILE%" /m /fl /flp:LogFile="install_%BUILDCONFIG%.log" /p:Configuration=%BUILDCONFIG% /p:Platform=%PLATFORM% /p:BuildProjectReferences=false
+endlocal

adm/templates/msvc.bat

@@ -1,10 +1,11 @@
 @echo off
+rem This file has been generated by genproj.tcl script from CASROOT/adm/templates/msvc.bat
 
 rem Setup environment
 call "%~dp0env.bat" %1 %2 %3
 
 rem Define path to project file
-set "PRJFILE=%~dp0\adm\msvc\%VCVER%\OCCT.sln"
+set "PRJFILE=%~dp0\adm\msvc\%VCVER%\__SOLUTION__.sln"
 if not exist "%PRJFILE%" set "PRJFILE=%~dp0\adm\msvc\%VCVER%\Products.sln"
 if not "%4" == "" (
   set "PRJFILE=%4"

adm/templates/sample.bat

@@ -19,6 +19,7 @@ if ["%1"] == [""] (
   echo    AndroidQt
   echo    FuncDemo
   echo    IESample
+  echo    OCCTOverview  
   echo    Tutorial
   PAUSE
   exit /B
@@ -35,5 +36,8 @@ if not exist "%EXE_PATH%" (
   exit /B
 )
 
+rem Set path to location where sample code is installed
+set "CSF_OCCTOverviewSampleCodePath=%CSF_OCCTSamplesPath%\OCCTOverview\code"
+
 "%EXE_PATH%"
 

adm/templates/sample.sh

@@ -8,6 +8,7 @@ if [ "$1" == "" ]; then
   echo available samples:
   echo    FuncDemo
   echo    IESample
+  echo    OCCTOverview
   echo    Tutorial
 fi
 
@@ -31,5 +32,7 @@ if [ ! -f "$EXE_PATH" ]; then
   exit 1
 fi
 
+export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/OCCTOverview/code"
+
 cd ${aCurrentPath}
-"$EXE_PATH"
+"$EXE_PATH"

adm/templates/template.vc10

@@ -159,7 +159,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -255,7 +255,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

adm/templates/template.vc10x

@@ -149,7 +149,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -238,7 +238,7 @@
       <PreprocessorDefinitions>_DEBUG;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>

adm/templates/xcode.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+# This file has been generated by genproj.tcl script from CASROOT/adm/templates/xcode.sh
 
 export TARGET="xcd"
 
 source ./env.sh "$1" "$TARGET"
 
-open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace
+open -a Xcode ./adm/mac/xcd/__SOLUTION__.xcworkspace

adm/upgrade.dat

@@ -71,6 +71,7 @@ BOPTools::MapShapesAndAncestors TopExp::MapShapesAndAncestors
 BOPCol_Box2DBndTreeSelector BOPTools_BoxSelector<Bnd_Box2d>
 BiTgte_DataMapOfShapeBox TopTools_DataMapOfShapeBox
 CDM_MessageDriver Message_Messenger
+Message_ProgressSentry Message_ProgressScope
 
 [tcollection]
 AdvApp2Var_SequenceOfNode

dox/CMakeLists.txt

@@ -89,6 +89,14 @@ file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nEXTERNAL_SEARCH        = NO")
 # Formula options
 file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nMATHJAX_RELPATH        = ${3RDPARTY_MATHJAX_RELATIVE_PATH}")
 
+# If MSVC is used as build system, change warning format to the one recognized by MSVC
+if (MSVC)
+  file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nWARN_FORMAT            = \"$file($line): $text\"")
+endif()
+
+# Avoid Doxygen parsing messages in the build log
+file (APPEND ${OCCT_CONFIG_FOR_DOXYGEN} "\nQUIET                  = YES")
+
 # Copy index file to provide fast access to HTML documentation
 file(COPY "${OCCT_OVERVIEW_RESOURCE_DIR}/index.html" DESTINATION "${OCCT_GENERATED_OVERVIEW_DIR}")
 

dox/FILES_HTML.txt

@@ -5,54 +5,56 @@
 # The order of files in this list determines order of top-level pages
 # in the generated documentation.
 
-overview/overview.md
+introduction/introduction.md
 
+samples/samples.md
 ../samples/mfc/standard/ReadMe.md
 ../samples/CSharp/ReadMe.md
 ../samples/CSharp/ReadMe_D3D.md
-
 ../samples/qt/AndroidQt/ReadMe.md
+../samples/qt/OCCTOverview/ReadMe.md
 ../samples/java/jniviewer/ReadMe.md
 ../samples/ios/UIKitSample/ReadMe.md
+../samples/webgl/ReadMe.md
+samples/ocaf.md
+samples/ocaf_func.md
+samples/draw_scripts.md
 
 tutorial/tutorial.md
 
-technical_overview/technical_overview.md
+build/build_upgrade.md
+build/build_occt/building_occt.md
+build/build_3rdparty/building_3rdparty.md
+build/build_documentation/building_documentation.md
+
+debug/debug.md
+upgrade/upgrade.md
 
 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/mesh/mesh.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/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md
-user_guides/brep_wp/brep_wp.md
 user_guides/vis/vis.md
 
-dev_guides/dev_guides.md
-dev_guides/documentation/documentation.md
-dev_guides/contribution/coding_rules.md
-dev_guides/contribution_workflow/contribution_workflow.md
-dev_guides/git_guide/git_guide.md
-dev_guides/tests/tests.md
-dev_guides/debug/debug.md
-dev_guides/upgrade/upgrade.md
+specification/specification.md
+specification/boolean_operations/boolean_operations.md
+specification/brep_format.md
+specification/pbr_math.md
 
-dev_guides/building/building.md
-dev_guides/building/3rdparty/3rdparty_windows.md
-dev_guides/building/3rdparty/3rdparty_linux.md
-dev_guides/building/3rdparty/3rdparty_osx.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
+contribution/contribution.md
+contribution/documentation/documentation.md
+contribution/coding_rules.md
+contribution/contribution_workflow/contribution_workflow.md
+contribution/git_guide/git_guide.md
+contribution/tests/tests.md
 
 license.md

dox/FILES_PDF.txt

@@ -4,27 +4,29 @@
 # Empty spaces are allowed.
 # Strings starting with '#' are treated as comments and ignored.
 
-user_guides/brep_wp/brep_wp.md
+tutorial/tutorial.md
+
+upgrade/upgrade.md
+
 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/mesh/mesh.md
 user_guides/ocaf/ocaf.md
-user_guides/step/step.md
-user_guides/draw_test_harness/draw_test_harness.md
-user_guides/inspector/inspector.md
-user_guides/tobj/tobj.md
 user_guides/visualization/visualization.md
-user_guides/xde/xde.md
 user_guides/vis/vis.md
+user_guides/iges/iges.md
+user_guides/step/step.md
+user_guides/xde/xde.md
+user_guides/inspector/inspector.md
+user_guides/draw_test_harness/draw_test_harness.md
 
-dev_guides/contribution_workflow/contribution_workflow.md
-dev_guides/documentation/documentation.md
-dev_guides/contribution/coding_rules.md
-dev_guides/git_guide/git_guide.md
-dev_guides/tests/tests.md
-dev_guides/upgrade/upgrade.md
+contribution/contribution_workflow/contribution_workflow.md
+contribution/documentation/documentation.md
+contribution/coding_rules.md
+contribution/git_guide/git_guide.md
+contribution/tests/tests.md
 
-tutorial/tutorial.md
+specification/boolean_operations/boolean_operations.md
+specification/brep_format.md
+specification/pbr_math.md

dox/build/build_3rdparty/building_3rdparty.md

@@ -0,0 +1,633 @@
+ Build 3rd-parties {#build_upgrade_building_3rdparty}
+==============================================
+@tableofcontents
+
+On Windows, the easiest way to install third-party libraries is to download archive with pre-built binaries from https://opencascade.com/content/3rd-party-components.
+On Linux and OS X, it is recommended to use the version installed in the system natively.
+
+@section dev_guides__building_3rdparty_win_1 Windows
+
+This document presents guidelines for building third-party products used by Open CASCADE Technology (OCCT) and samples on Windows platform. It is assumed that you are already familiar with MS Visual Studio / Visual C++. 
+
+You need to use the same version of MS Visual Studio for building all third-party products and OCCT itself, in order to receive a consistent set of run-time binaries. 
+
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
+
+There are two types of third-party products used  by OCCT: 
+
+* Mandatory  products: 
+	* Tcl/Tk 8.5 -- 8.6;
+	* FreeType 2.4.10 -- 2.5.3.
+* Optional  products:
+	* TBB 3.x -- 4.x;
+	* 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*). 
+
+Further in this document, this folder is referred to as *3rdparty*. 
+
+@subsection dev_guides__building_3rdparty_win_2 Tcl/Tk
+
+Tcl/Tk is required for DRAW test harness.
+
+**Installation from sources: Tcl**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. In the *win* sub-directory, edit file *buildall.vc.bat*:
+
+   * Edit the line "call ... vcvars32.bat" to have correct path to the version of Visual Studio to be used for building, for instance:
+
+         call "%VS80COMNTOOLS%\vsvars32.bat"
+
+     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
+
+**Installation from sources: Tk**
+  
+Download the necessary archive from https://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
+
+FreeType is required for text display in a 3D viewer. You can download its sources from https://sourceforge.net/projects/freetype/files/
+
+### The building procedure
+
+1. Unpack the downloaded archive of FreeType product into the *3rdparty*  folder. As a result, you will get a folder named, for example, *3rdparty\\freetype-2.4.10*.  Further in this document, this folder is referred to as *freetype*. 
+   
+2. Open the solution file *freetype\\builds\\win32\\vc20xx\\freetype.sln*  in Visual Studio. Here *vc20xx* stands for your version of Visual Studio. 
+
+3. Select the configuration to build: either Debug or Release. 
+
+4. Build  the *freetype* project. 
+
+   As a result, you will get a  freetype import library (.lib) in the *freetype\\obj\\win32\\vc20xx*  folder.  
+
+
+5. If you build FreeType for a 64 bit platform, select in the main menu **Build - Configuration Manager**  and add *x64* platform to the solution configuration by copying the settings from Win32 platform: 
+
+   @figure{/build/build_3rdparty/images/3rdparty_image001.png}
+
+   Update the value of the Output File for  x64 configuration: 
+
+   @figure{/build/build_3rdparty/images/3rdparty_image003.png}
+
+   Build the *freetype* project. 
+
+   As a result, you will obtain a 64 bit import library (.lib) file in the *freetype\\x64\\vc20xx*  folder. 
+
+   To build FreeType as a dynamic library (.dll) follow steps 6, 7 and 8 of this procedure. 
+
+6. Open menu Project-> Properties-> Configuration  Properties-> General and change option **Configuration Type** to *Dynamic  Library (.dll)*. 
+7. Edit file *freetype\\include\\freetype\\config\\ftoption.h*:  
+  
+   in line 255, uncomment the definition of macro *FT_EXPORT* and change it as follows: 
+
+       #define FT_EXPORT(x)   __declspec(dllexport) x 
+
+8. Build  the *freetype* project. 
+
+   As a result, you will obtain the files of the import  library (.lib) and the dynamic library (.dll)   in folders <i>freetype  \\objs\\release</i> or <i>\\objs\\debug </i>. 
+   
+   If you build for a 64 bit platform, follow step 5 of the procedure. 
+
+   To facilitate the use of FreeType libraries in OCCT with minimal adjustment of build procedures, it is recommended to copy the include files and libraries of FreeType into a separate folder, named according to the pattern: *freetype-compiler-bitness-building mode*, where: 
+   * **compiler** is *vc8* or *vc9* or *vc10* or *vc11*; 
+   * **bitness**  is *32* or *64*;
+   * **building mode** is *opt* (for Release) or *deb* (for Debug). 
+    
+   The *include* subfolder should be copied as is, while libraries should be renamed to *freetype.lib* and *freetype.dll* (suffixes removed) and placed to subdirectories *lib *and  *bin*, respectively. If the Debug configuration is built, the Debug libraries should be put into subdirectories *libd* and *bind*. 
+
+
+@subsection dev_guides__building_3rdparty_win_3_1 TBB
+
+This third-party product is installed with binaries 
+from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the  release version you need  (e.g. *tbb30_018oss*) and pick the archive for Windows  platform. 
+
+Unpack the downloaded  archive of TBB product into the *3rdparty* folder. 
+
+Further in this document,  this folder is referred to as *tbb*. 
+
+@subsection dev_guides__building_3rdparty_win_3_3 FreeImage
+
+This third-party product should be built as a dynamically loadable library (.dll file). 
+You can download its sources from 
+https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+
+### The building procedure: 
+
+1. Unpack the  downloaded archive of FreeImage product into *3rdparty* folder. 
+  
+   As a result, you should have a folder named *3rdparty\\FreeImage*. 
+  
+   Rename it according to the rule: *freeimage-platform-compiler-building  mode*, where 
+   
+   * **platform**  is *win32* or *win64*; 
+   * **compiler**  is *vc8* or *vc9* or *vc10* or *vc11*; 
+   * **building  mode** is *opt* (for release) or *deb* (for debug) 
+
+   Further in this  document, this folder is referred to as *freeimage*. 
+
+2. Open the solution file *freeimage\\FreeImage.*.sln* in your Visual Studio. 
+  
+   If you use a Visual Studio version higher than VC++ 2008, apply conversion of the workspace. 
+   Such conversion should be suggested automatically by Visual  Studio. 
+    
+3. Select a  configuration to build. 
+
+   - Choose **Release**  if you are building Release binaries. 
+   - Choose **Debug** if you are building  Debug binaries. 
+
+   *Note:* 
+
+   If you want to  build a debug version of FreeImage binaries then you need to rename the following files in FreeImage and FreeimagePlus projects:
+   
+   Project -> Properties -> Configuration Properties -> Linker -> General -> Output File
+
+       FreeImage*d*.dll  to FreeImage.dll 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
+
+   Project -> Properties -> Configuration Properties -> Linker -> Debugging-> Generate Program Database File
+
+       FreeImage*d*.pdb  to FreeImage.pdb 
+       FreeImagePlus*d*.pdb to FreeImagePlus.pdb 
+
+   Project -> Properties -> Configuration Properties -> Linker -> Advanced-Import Library
+
+       FreeImage*d*.lib  to FreeImage.lib 
+       FreeImagePlus*d*.lib  to FreeImagePlus.lib 
+
+   Project -> Properties -> Configuration Properties -> Build Events -> Post -> Build Event -> Command Line 
+
+       FreeImage*d*.dll     to FreeImage.dll 
+       FreeImage*d*.lib     to FreeImage.lib 
+       FreeImagePlus*d*.dll to FreeImagePlus.dll 
+       FreeImagePlus*d*.lib to FreeImagePlus.lib 
+
+   Additionally, rename in project FreeImagePlus 
+   
+   Project -> Properties -> Configuration  Properties -> Linker -> Input -> Additional Dependencies 
+
+       from FreeImage*d*.lib to FreeImage.lib 
+
+4. Select a platform to build. 
+
+   - Choose *Win32* if you are building for a 32 bit platform. 
+   - Choose *x64* if you are building for a 64 bit platform. 
+
+5. Start the building process. 
+
+   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_3_4 VTK
+
+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.
+
+### The building procedure:
+
+1. Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it into *3rdparty* folder.
+
+   As a result, you will get a folder named, for example, <i>3rdparty\VTK-6.1.0.</i>
+
+   Further in this document, this folder is referred to as *VTK*.
+
+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.
+
+3. Build project VTK in Release mode.
+
+
+@section build_3rdparty_linux Linux
+
+This document presents additional guidelines for building third-party 
+products used by Open CASCADE Technology and samples on Linux platform. 
+
+The links for downloading the third-party products are available on the web site at 
+https://opencascade.com/content/3rd-party-components.
+
+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.5.3;
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0;
+	* VTK 6.1.0.
+
+
+@subsection dev_guides__building_3rdparty_linux_2_1 Tcl/Tk 
+
+Tcl/Tk is required for DRAW test harness. 
+
+**Installation from sources: Tcl**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. Enter the unix sub-directory of the directory where the Tcl source  files are located <i>(TCL_SRC_DIR)</i>. 
+
+       cd TCL_SRC_DIR/unix   
+
+2. Run the *configure* command:
+
+       configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
+  
+3. If the configure command has finished successfully, start  the building process:
+  
+       make   
+
+4. If building is finished successfully, start the installation of Tcl. 
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR* 
+
+       make install   
+
+**Installation from sources: Tk**
+  
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+  
+1. Enter the unix sub-directory of the directory where the Tk source files are located <i>(TK_SRC_DIR)</i> 
+
+       cd TK_SRC_DIR/unix   
+
+2. Run the configure command, where <i>TCL_LIB_DIR</i> is *TCL_INSTALL_DIR/lib*.
+
+       configure --enable-gcc  --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR  --prefix=TK_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
+
+3. If the configure command has finished successfully, start the building process: 
+
+       make   
+
+4. If the building has finished successfully, start the installation of Tk. 
+   All binary and service files of the product will be copied 
+   to the directory defined by *TK_INSTALL_DIR* (usually it is *TCL_INSTALL_DIR*) 
+
+       make install   
+
+@subsection dev_guides__building_3rdparty_linux_2_2 FreeType
+
+FreeType is required for text display in the 3D viewer. 
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+  
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
+
+       cd FREETYPE_SRC_DIR   
+
+2. Run the *configure* command: 
+  
+       configure  --prefix=FREETYPE_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
+    
+3. If the *configure* command has finished successfully, start  the building process: 
+
+       make   
+
+4. If the building has finished successfully, start the installation of FreeType. 
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR* 
+    
+       make install   
+
+    
+@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 https://github.com/intel/tbb.
+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_3 FreeImage
+
+Download the necessary archive from https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*. 
+  
+1. Modify *FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h*: 
+   In line 60 insert the following: 
+
+       #include string.h   
+
+2. Enter the directory where the source files of FreeImage are located <i>(FREEIMAGE_SRC_DIR)</i>. 
+  
+       cd FREEIMAGE_SRC_DIR   
+
+3. Run the building process 
+  
+       make   
+
+4. Run the installation process 
+
+   a. If you have the permission to write into directories <i>/usr/include</i> and <i>/usr/lib</i>, run the following command: 
+
+          make install   
+   b. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.gnu*: 
+  
+      Change lines 7-9 from:
+  
+          DESTDIR ?= /   
+          INCDIR  ?= $(DESTDIR)/usr/include   
+          INSTALLDIR  ?= $(DESTDIR)/usr/lib   
+
+      to: 
+
+          DESTDIR  ?= $(DESTDIR)   
+          INCDIR  ?= $(DESTDIR)/include   
+          INSTALLDIR  ?= $(DESTDIR)/lib   
+
+      Change lines 65-67 from: 
+
+          install  -m 644 -o root -g root $(HEADER) $(INCDIR)   
+          install  -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)   
+          install  -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)   
+  
+      to:
+
+          install  -m 755 $(HEADER) $(INCDIR)   
+          install  -m 755 $(STATICLIB) $(INSTALLDIR)   
+          install  -m 755 $(SHAREDLIB) $(INSTALLDIR)
+
+      Change line 70 from: 
+
+          ldconfig
+
+      to:
+  
+          \#ldconfig   
+    
+   Then run the installation process by the following command: 
+
+        make DESTDIR=FREEIMAGE_INSTALL_DIR  install   
+
+5. Clean temporary files
+
+        make clean
+
+@subsection dev_guides__building_3rdparty_linux_3_4 VTK
+
+You can download VTK sources from https://www.vtk.org/VTK/resources/software.html
+
+### The building procedure:
+
+Download the necessary archive from https://www.vtk.org/VTK/resources/software.html and unpack it.
+
+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:
+
+       ccmake VTK_SRC_DIR
+
+   * 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
+
+3. Start the building of VTK:
+
+       make
+
+4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
+
+       make install
+
+@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories
+
+**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:
+
+    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
+
+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++
+
+@section build_3rdparty_macos Mac OS X
+
+This document presents additional guidelines for building third-party products 
+used by Open CASCADE Technology and samples on Mac OS X platform (10.6.4  and later). 
+
+The links for downloading the third-party products are available at https://opencascade.com/content/3rd-party-components.
+
+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.5.3.
+* Optional  products: 
+	* TBB 3.x - 4.x;
+	* FreeImage 3.14.1 - 3.16.0
+  
+
+@subsection dev_guides__building_3rdparty_osx_2_1 Tcl/Tk 8.5 
+
+Tcl/Tk is required for DRAW test harness. Version 8.5 or  8.6 can be used with OCCT. 
+
+**Installation from sources: Tcl 8.5**
+
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+
+1. Enter the *macosx* sub-directory of the directory where the Tcl source files are located <i>(TCL_SRC_DIR)</i>. 
+
+       cd TCL_SRC_DIR/macosx   
+
+2. Run the *configure* command 
+
+       configure --enable-gcc  --enable-shared --enable-threads --prefix=TCL_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>--enable-64bit</i> option to the command line. 
+
+3. If the *configure* command has finished successfully, start the building process 
+
+       make   
+  
+4. If building is finished successfully, start the installation of Tcl. 
+   All binary and service files of the product will be copied to the directory defined by *TCL_INSTALL_DIR*. 
+
+       make install   
+
+**Installation from sources: Tk 8.5**
+
+Download the necessary archive from https://www.tcl.tk/software/tcltk/download.html and unpack it.
+
+1. Enter the *macosx* sub-directory of the directory where the  source files of Tk are located <i>(TK_SRC_DIR)</i>. 
+
+       cd TK_SRC_DIR/macosx   
+
+2. Run the *configure* command, where TCL_LIB_DIR is  TCL_INSTALL_DIR/lib 
+
+       configure --enable-gcc --enable-shared --enable-threads --with-tcl=TCL_LIB_DIR --prefix=TK_INSTALL_DIR   
+
+	For a 64 bit platform also add <i>--enable-64bit</i> option to the  command line. 
+
+3. If the *configure* command has finished successfully, start the building process:
+
+       make   
+
+4. If the building has finished successfully, start the  installation of Tk. All binary and service files of the product will be copied to the directory defined by *TK_INSTALL_DIR* (usually it is TCL_INSTALL_DIR) 
+
+       make install   
+
+@subsection dev_guides__building_3rdparty_osx_2_2 FreeType 2.4.10
+  
+FreeType is required for text display in the 3D viewer. 
+
+Download the necessary archive from https://sourceforge.net/projects/freetype/files/ and unpack it.
+
+1. Enter the directory where the source files of FreeType  are located <i>(FREETYPE_SRC_DIR)</i>. 
+
+       cd FREETYPE_SRC_DIR   
+
+2. Run the *configure* command 
+  
+       configure  --prefix=FREETYPE_INSTALL_DIR   
+
+   For a 64 bit platform also add <i>CFLAGS='-m64 -fPIC'  CPPFLAGS='-m64 -fPIC'</i> option to the command line. 
+
+3. If the *configure* command has finished successfully, start  the building process 
+
+       make   
+
+4. If building has finished successfully, start the installation of FreeType. 
+   All binary and service files of the product will be copied to the directory defined by *FREETYPE_INSTALL_DIR*.
+
+       make install   
+    
+@subsection dev_guides__building_3rdparty_osx_3_1 TBB 3.x or 4.x
+
+This third-party product is installed with binaries from the archive 
+that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the release version you need (e.g. *tbb30_018oss*) 
+and  pick the archive for Mac OS X platform. 
+To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
+
+@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
+
+Download the necessary archive from 
+https://sourceforge.net/projects/freeimage/files/Source%20Distribution/
+and unpack it. The directory with unpacked sources is  further referred to as *FREEIMAGE_SRC_DIR*.  
+
+Note that for building FreeImage on Mac OS X 10.7 you should replace *Makefile.osx* 
+in *FREEIMAGE_SRC_DIR* by the corrected file, which you can find in attachment to issue #22811 in OCCT Mantis bug tracker 
+(https://tracker.dev.opencascade.org/file_download.php?file_id=6937&type=bug).
+
+1. If you build FreeImage 3.15.x you can skip this  step. 
+   Modify <i>FREEIMAGE_SRC_DIR/Source/OpenEXR/Imath/ImathMatrix.h:</i> 
+  
+   In line 60 insert the following: 
+
+       #include string.h 
+
+   Modify <i>FREEIMAGE_SRC_DIR/Source/FreeImage/PluginTARGA.cpp:</i> 
+  
+   In line 320 replace: 
+
+       SwapShort(value); 
+
+   with: 
+
+       SwapShort(&value); 
+
+2. Enter the directory where the source files of FreeImage  are located <i>(FREEIMAGE_SRC_DIR)</i>. 
+
+       cd FREEIMAGE_SRC_DIR 
+
+3. Run the building process 
+
+       make   
+
+4. Run the installation process 
+   
+   1. If you have the permission to write into <i>/usr/local/include</i>  and <i>/usr/local/lib</i> directories, run the following command: 
+
+          make install   
+
+   2. If you do not have this permission, you need to modify file *FREEIMAGE_SRC_DIR/Makefile.osx*: 
+
+      Change line 49 from:     
+
+          PREFIX ?= /usr/local
+
+      to:
+   
+          PREFIX  ?= $(PREFIX) 
+
+      Change lines 65-69 from: 
+
+          install -d -m 755 -o  root -g wheel $(INCDIR) $(INSTALLDIR) 
+          install  -m 644 -o root -g wheel $(HEADER) $(INCDIR) 
+          install  -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) 
+          ranlib  -sf $(INSTALLDIR)/$(STATICLIB) 
+          ln  -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) 
+    
+      to: 
+
+          install  -d $(INCDIR) $(INSTALLDIR) 
+          install  -m 755 $(HEADER) $(INCDIR) 
+          install  -m 755 $(STATICLIB) $(INSTALLDIR) 
+          install  -m 755 $(SHAREDLIB) $(INSTALLDIR) 
+          ln  -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)  
+          ln  -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+
+      Then run the installation process by the following command: 
+  
+          make PREFIX=FREEIMAGE_INSTALL_DIR  install 
+  
+5. Clean temporary files 
+  
+       make clean 

dox/build/build_documentation/building_documentation.md

@@ -0,0 +1,19 @@
+Build Documentation {#build_upgrade__building_documentation}
+=================
+
+To generate HTML documentation from sources contained in *dox* subdirectory, 
+you need to have Tcl and Doxygen 1.8.5 (or above) installed on your system.
+
+Use script **gendoc** (batch file on Windows, shell script on Linux / Mac OSX) to generate documentation.
+
+To generate Overview documentation:
+
+    cmd> gendoc -overview
+
+To generate Reference manual:
+
+    cmd> gendoc -refman
+
+Run this command without arguments to get help on supported options.
+
+See @ref occt_contribution__documentation for prerequisites and details on OCCT documentation system.

dox/build/build_occt/building_occt.md

@@ -1,9 +1,17 @@
-Building with CMake {#occt_dev_guides__building_cmake}
+Build OCCT {#build_upgrade__building_occt}
 ===================
 
 @tableofcontents
 
-@section build_cmake_intro General
+@note Before building OCCT, make sure to have all required third-party libraries installed.
+The list of required libraries depends on what OCCT modules will be used, and your preferences.
+The typical minimum is **Freetype** (necessary for Visualization) and **Tcl/Tk** (for DRAW).
+See @ref intro_req "requirements on 3rdparty libraries" for a full list.
+On OS X we recommend to use native libraries.
+
+@section build_occt_windows Windows
+
+@subsection build_occt_win_cmake Building with CMake tool
 
 This article describes the **CMake**-based build process, which is now suggested as a standard way to produce the binaries of Open CASCADE Technology from sources. *OCCT requires CMake version 2.8.12 or later*.
 
@@ -12,9 +20,9 @@ This article describes the **CMake**-based build process, which is now suggested
 Here we describe the build procedure on the example of Windows platform with Visual Studio 2010. 
 However, CMake is cross-platform and can be used to build OCCT on Linux and OS X in essentially the same way.
 
-@note Before you start, make sure to have installed all 3-rd party products that you are going to use with OCCT; see @ref occt_dev_guides__building.
+@note Before you start, make sure to have installed all 3-rd party products that you are going to use with OCCT; see @ref build_upgrade.
 
-@section build_cmake_start Start CMake
+@subsubsection build_cmake_start Start CMake
 
 CMake is a tool that generates the actual project files for the selected target build system (e.g. Unix makefiles) or IDE (e.g. Visual Studio 2010).
 
@@ -37,14 +45,14 @@ It is however possible to choose one installation directory for several configur
     d:/occt-install            -- the installation directory that is
                                   able to contain several OCCT configurations
 
-@section build_cmake_conf Configuration process
+@subsubsection build_cmake_conf Configuration process
 
 If the command-line tool is used, run the tool from the build directory with a single argument indicating the source (relative or absolute path) directory:
 
     cd d:/tmp/occt-build-vc10-x64
     ccmake d:/occt
 
-@figure{/dev_guides/building/cmake/images/cmake_image000.png}
+@figure{/build/build_occt/images/cmake_image000.png}
 
 Press *c* to configure.
 
@@ -52,13 +60,13 @@ All actions required in the configuration process with the GUI tool will be desc
 
 If the GUI tool is used, run this tool without additional arguments and after that specify the source directory by clicking **Browse Source** and the build (binary) one by clicking **Browse Build**.
 
-@figure{/dev_guides/building/cmake/images/cmake_image001.png}
+@figure{/build/build_occt/images/cmake_image001.png}
 
 **Note**: 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 and compiler (e.g., <i>d:/occt/build/win32-vc10</i> ).
 
 Once the source and build directories are selected, "Configure" button should be pressed in order to start manual configuration process. It begins with selection of a target configurator. It is "Visual Studio 10 2010 Win64" in our example.
 
-@figure{/dev_guides/building/cmake/images/cmake_image002.png}
+@figure{/build/build_occt/images/cmake_image002.png}
 
 To build OCCT for **Universal Windows Platform (UWP)** specify the path to toolchain file for cross-compiling <i>d:/occt/adm/templates/uwp.toolchain.config.cmake</i>.
 
@@ -68,7 +76,7 @@ Alternatively, if you are using CMake from the command line add options -DCMAKE_
 
 Once "Finish" button is pressed, the first pass of the configuration process is executed. At the end of the process, CMake outputs the list of environment variables, which have to be properly specified for successful configuration. 
 
-@figure{/dev_guides/building/cmake/images/cmake_image003.png}
+@figure{/build/build_occt/images/cmake_image003.png}
 
 The error message provides some information about these variables. This message will appear after each pass of the process until all required variables are specified correctly.
 
@@ -82,6 +90,7 @@ The following table gives the full list of environment variables used at the con
 |----------|------|---------|
 | CMAKE_BUILD_TYPE | String | Specifies the build type on single-configuration generators (such as make).  Possible values are Debug, Release and RelWithDebInfo |
 | USE_FREEIMAGE | Boolean flag | Indicates whether FreeImage product should be used in OCCT visualization module for support of popular graphics image formats (PNG, BMP, etc.) |
+| USE_RAPIDJSON | Boolean flag | Indicates whether RapidJSON product should be used in OCCT Data Exchange module for support of glTF mesh file format |
 | USE_TBB | Boolean flag | Indicates whether TBB 3rd party is used or not. TBB stands for Threading Building Blocks, the technology of Intel Corp, which comes with different mechanisms and patterns for injecting parallelism into your application. OCCT remains parallel even without TBB product |
 | USE_VTK | Boolean flag | Indicates whether VTK 3rd party is used or not. VTK stands for Visualization ToolKit, the technology of Kitware Inc intended for general-purpose scientific visualization. OCCT comes with a bridge between CAD data representation and VTK by means of its dedicated VIS component (VTK Integration Services). You may skip this 3rd party unless you are planning to use VTK visualization for OCCT geometry. See the official documentation @ref occt_user_guides__vis for the details on VIS |
 | 3RDPARTY_DIR | Path | Defines the root directory where all required 3rd party products will be searched. Once you define this path it is very convenient to click "Configure" button in order to let CMake automatically detect all necessary products|
@@ -123,7 +132,7 @@ The following table gives the full list of environment variables used at the con
 
 **Note:** Only the forward slashes ("/") are acceptable in the CMake options defining paths.
 
-@section build_cmake_3rdparty 3rd party search mechanism
+@subsubsection build_cmake_3rdparty 3rd party search mechanism
 
 If *3RDPARTY_DIR* directory is defined, then required 3rd party binaries are sought in it, and default system folders are ignored.
 
@@ -166,15 +175,15 @@ During the configuration process the related variables (*3RDPARTY_FREETYPE_DLL_D
 
 **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.
 
-@section build_cmake_gen Projects generation
+@subsubsection build_cmake_gen Projects generation
 
 Once the configuration process is done, the "Generate" button is used to prepare project files for the target IDE. In our exercise the Visual Studio solution will be automatically created in the buid directory.
 
-@section build_cmake_build Building
+@subsubsection build_cmake_build Building
 
 Go to the build folder, start the Visual Studio solution *OCCT.sln* and build it by clicking **Build -> Build Solution**.
 
-@figure{/dev_guides/building/cmake/images/cmake_image004.png}
+@figure{/build/build_occt/images/cmake_image004.png}
 
 By default the build solution process skips the building of the INSTALL and Overview project.
 
@@ -184,7 +193,7 @@ When the building process is finished build:
 
 For this, right-click on the *Overview/INSTALL* project and select **Project Only -> Build Only** -> *Overview/INSTALL* in the solution explorer. 
 
-@section build_cmake_install Installation
+@subsubsection build_cmake_install Installation
 
 Installation is a process of extracting redistributable resources (binaries, include files etc) from the build directory into the installation one. The installation directory will be free of project files, intermediate object files and any other information related to the build routines. 
 
@@ -212,3 +221,362 @@ follows:
 If CMake installation flags are enabled for the 3rd party products (e.g. INSTALL_FREETYPE), then the corresponding binaries will be copied to the same bin(d) and lib(d) directories together with the native binaries of OCCT. Such organization of libraries can be especially helpful if your OCCT-based software does not use itself the 3rd parties of Open CASCADE Technology (thus, there is no sense to pack them into dedicated directories).
 
 The installation folder contains the scripts to run *DRAWEXE* (*draw.bat* or *draw.sh*), samples (if they were installed) and overview.html (short-cut for installed OCCT overview documentation).
+
+@subsection build_occt_win_codeblocks Building with Code::Blocks
+
+This file describes steps to build OCCT libraries from sources using **Code::Blocks**, a cross-platform IDE, using project files generated by OCCT legacy tool **genproj**.
+It can be used as an alternative to CMake build system (see @ref build_occt_win_cmake) for all supported platforms.
+
+@subsubsection build_codeblocks_3rdparty Third-party libraries
+
+Before building OCCT, make sure to have all the needed third-party libraries installed, see @ref build_upgrade.
+
+@subsubsection build_codeblocks_conf Configuration
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* (on Linux and OS X) or *custom.bat* (on Windows) which can be edited directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC*. 
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_FREEIMAGE=false
+~~~~~
+
+Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure environment interactively:
+
+@figure{/build/build_occt/images/genconf_linux.png}
+
+Click "Save" to store the specified configuration in *custom.sh* or *custom.bat* file.
+  
+@subsubsection build_codeblocks_gen Projects generation
+
+Launch **genproj** tool with option *cbp* to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj cbp
+~~~~~
+
+The generated Code::Blocks project are placed into subfolder *adm/&lt;OS&gt;/cbp*.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+@subsubsection build_codeblocks_build Building
+
+To start **Code::Blocks**, launch script *codeblocks.sh*.
+
+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, run the script
+~~~~~
+   ./draw.sh cbp [d]
+~~~~~
+Option *d* is used if OCCT has been built in **Debug** mode.
+
+@subsection build_occt_genproj Building with Genproj tool
+
+This page describes steps to build OCCT libraries from a complete source archive on Windows with <b>MS Visual C++</b> using projects generated by **genproj** tool. 
+It is an alternative to use of CMake build system (see @ref build_occt_win_cmake).
+
+**genproj** is a legacy tool (originated from command "wgenproj" in WOK) for generation of Visual Studio, Code.Blocks, and XCode project files used for building Open CASCADE Technology.
+These project files are placed inside OCCT directory (in *adm* subfolder) and use relative paths, thus can be moved together with sources.
+
+The project files included in official distribution of OCCT are generated by this tool.
+If you have official distribution with project files included, you can use them directly without a need to call **genproj**.
+
+@subsubsection build_msvc_3rdparty Third-party libraries
+
+Before building OCCT, make sure to have all the required third-party libraries installed.
+
+The easiest way to install third-party libraries is to download archive with pre-built binaries, corresponding to version of Visual Studio you are using, from https://opencascade.com/content/3rd-party-components.
+
+You can also build third-party libraries from their sources, see @ref build_upgrade_building_3rdparty for instructions.
+
+@subsubsection build_msvc_conf Configuration
+
+If you have Visual Studio projects already available (pre-installed or generated), you can edit file *custom.bat* manually to adjust the environment:
+
+* *VCVER* -- specification of format of project files, defining also version of Visual Studio to be used, and default name of the sub-folder for binaries:
+
+| VCVER     | Visual Studio version | Windows Platform                 | Binaries folder name |
+|-----------|-----------------------|----------------------------------|----------------------|
+| vc10      | 2010 (10)             | Desktop (Windows API)            | vc10 |
+| vc11      | 2012 (11)             | Desktop (Windows API)            | vc11 |
+| vc12      | 2013 (12)             | Desktop (Windows API)            | vc12 |
+| vc14      | 2015 (14)             | Desktop (Windows API)            | vc14 |
+| vc14-uwp  | 2015 (14)             | UWP (Universal Windows Platform) | vc14-uwp |
+| vc141     | 2017 (15)             | Desktop (Windows API)            | vc14 |
+| vc141-uwp | 2017 (15)             | UWP (Universal Windows Platform) | vc14-uwp |
+| vc142     | 2019 (16)             | Desktop (Windows API)            | vc14 |
+| vc142-uwp | 2019 (16)             | UWP (Universal Windows Platform) | vc14-uwp |
+
+* *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
+* <i>CSF_OPT_*</i> -- paths to search for includes and binaries of all used  third-party products
+* *SHORTCUT_HEADERS* -- defines method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+
+Alternatively, you can launch **genconf**, a GUI tool allowing to configure build options interactively.
+That tool will analyze your environment and propose you to choose available options:
+
+* Version of Visual Studio to be used (from the list of installed ones, detected by presence of environment variables like *VS100COMNTOOLS*).
+* Method to populate folder *inc* (short-cuts by default).
+* Location of third-party libraries (usually downloaded from OCCT web site, see above).
+* Path to common directory where third-party libraries are located (optional).
+* Paths to headers and binaries of the third-party libraries (found automatically basing on previous options; click button "Reset" to update).
+* Generation of PDB files within Release build ("Release with Debug info", false by default).
+
+@figure{/build/build_occt/images/genconf_windows.png}
+
+Click "Save" to store the specified configuration in *custom.bat* file.
+  
+@subsubsection build_msvc_generate Projects generation
+
+Launch **genproj** to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+If Tcl is not found, the tool may prompt you to enter the path to directory where Tcl can be found.
+ 
+~~~~~
+  $ genproj.bat
+~~~~~
+
+Note that if *custom.bat* is not present, **genproj** will start **genconf** to configure environment.
+
+@subsubsection build_msvc_build Building
+
+Launch *msvc.bat* to start Visual Studio with all necessary environment variables defined, and build the whole solution or required toolkits.
+
+Note: the MSVC project files are located in folders <i>adm\\msvc\\vc...</i>.
+Binaries are produced in *win32* or *win64* folders.
+
+To start DRAW, launch *draw.bat*.
+
+@section build_occt_linux Linux
+
+You may choose one of the following ways to generate, configure and build OCCT sources on Linux just keeping in mind 
+this platform specific:
+
+* @ref build_occt_win_cmake "Configuration, generation and building OCCT on Windows using CMake tool"
+* @ref build_occt_code_blocks "Building on Mac OS X with Code::Blocks IDE"
+
+@section build_occt_crossplatform_cmake Android (cross-compiling)
+
+This article describes the steps to build OCCT libraries for Android from a complete source package
+with GNU make (makefiles). The steps on Windows 7 and Ubuntu 15.10 are similar. There is the only one difference:
+ makefiles are built with mingw32-make
+on Windows and native GNU make on Ubuntu.
+
+Required tools (download and install if it is required):
+  - CMake v3.0+ http://www.cmake.org/cmake/resources/software.html
+  - Cross-compilation toolchain for CMake https://github.com/taka-no-me/android-cmake
+  - Android NDK rev.10+ https://developer.android.com/tools/sdk/ndk/index.html
+  - GNU Make: MinGW v4.82+ for Windows (http://sourceforge.net/projects/mingw/files/), GNU Make 4.0 for Ubuntu. 
+
+Run GUI tool provided by CMake.
+
+@subsection build_occt_crossplatform_cmake_config Configuration
+
+**Configure Tools**
+  - 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{/build/build_occt/images/android_image001.png}
+
+Click **Configure** button. It opens the window with a drop-down list of generators supported by CMake project.
+
+Select "MinGW MakeFiles" item from the list
+  - Choose "Specify toolchain file for cross-compiling"
+  - Click "Next"
+@figure{/build/build_occt/images/android_image002.png}
+
+  - Specify a toolchain file at the next dialog by android.toolchain.cmake . It is contained by cross-compilation 
+toolchain for CMake
+  - Click "Finish"
+@figure{/build/build_occt/images/android_image003.png}
+
+If ANDROID_NDK environment variable is not defined in current OS, add cache entry ANDROID_NDK (entry type is PATH) -- 
+path to the NDK folder ("Add Entry" button)
+@figure{/build/build_occt/images/android_image004.png}
+
+If on Windows the message is appeared: "CMake Error: CMake was unable to find a build program corresponding 
+to "MinGW Makefiles"
+CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.",
+specify **CMAKE_MAKE_PROGRAM** to mingw32-make executable.
+@figure{/build/build_occt/images/android_image005.png}
+
+**Configure OCCT**
+
+How to configure OCCT, see "OCCT Configuration" section of @ref build_occt_win_cmake 
+"Configure, Generate, Build using CMake tool" taking into account the specific configuration variables for android:
+  - ANDROID_ABI = armeabi-v7a
+  - ANDROID_NATIVE_API_LEVEL = 15
+  - ANDROID_NDK_LAYOUT is equal to CMAKE_BUILD_TYPE variable
+  - **BUILD_MODULE_Draw = OFF**
+
+@figure{/build/build_occt/images/android_image006.png}
+
+@subsection build_occt_crossplatform_cmake_generation Generate Makefiles
+
+Click **Generate** button and wait until the generation process is finished. 
+Then makefiles will appear in the build folder (e.g. <i> D:/tmp/occt-android </i>).
+
+@subsection build_occt_crossplatform_cmake_building Build Makefiles
+
+Open console and go to the build folder. Type "mingw32-make" (Windows) or "make" (Ubuntu) to start build process.
+
+> mingw32-make
+or
+> make
+
+Parallel building can be started with using **"-jN"** argument of "mingw32-make/make", where N is the number of
+ building threads.
+
+> mingw32-make -j4
+or
+> make -j4
+
+@subsection build_occt_crossplatform_cmake_install Install OCCT Libraries
+
+Type "mingw32-make/make" with argument "install" to place the libraries to the install folder
+
+> mingw32-make install
+or
+> make install
+
+@section build_occt_macos Mac OS X
+
+@subsection build_occt_macos_xcode Building with Xcode
+
+This file describes steps to build OCCT libraries from sources on Mac OS X with **Xcode** projects, generated by OCCT legacy tool **genproj**.
+
+<h2>Configuration</h2>
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* which can be edited directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC* (use colon ":" as path separator).
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_GL2PS=false
+~~~~~
+
+Alternatively, or when *custom.sh* does not exist, you can launch *genconf.sh* to configure environment interactively:
+
+@figure{/build/build_occt/images/genconf_osx.png}
+
+Click "Save" to store the specified configuration in *custom.sh* file.
+  
+<h2>Projects generation</h2>
+
+Launch **genproj** tool to update content of *inc* folder and generate project files after changes in OCCT code affecting layout or composition of source files.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+For instance, in Terminal application:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj
+~~~~~
+
+<h2>Building</h2>
+
+To start **Xcode**, launch script *xcode.sh*.
+
+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*; then click **Next** and **Create**).
+* 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.  
+* Click "+" button to add the necessary toolkits to the target project. It is possible to select all toolkits by pressing **Command+A** combination. 
+
+<h2>Launching DRAW</h2>
+
+To start *DRAWEXE*, which has been built with Xcode on Mac OS X, perform the following steps:
+
+1.Open Terminal application
+
+2.Enter <i>\<OCCT_ROOT_DIR\></i>:
+~~~~~
+   cd \<OCCT_ROOT_DIR\>
+~~~~~
+
+3.Run the script
+~~~~~
+   ./draw_cbp.sh xcd [d]
+~~~~~
+
+Option *d* is used if OCCT has been built in **Debug** mode.
+
+@subsection build_occt_code_blocks Building with Code::Blocks
+
+This file describes steps to build OCCT libraries from sources using **Code::Blocks**, a cross-platform IDE, using 
+project files generated by OCCT legacy tool **genproj**.
+
+<h2>Configure</h2>
+
+Before building it is necessary to set up build environment.
+
+The environment is defined in the file *custom.sh* (on Linux and OS X) or *custom.bat* (on Windows) which can be edited 
+directly:
+
+* Add paths to includes of used third-party libraries in variable *CSF_OPT_INC*. 
+* Add paths to their binary libraries in variable  *CSF_OPT_LIB64*.
+* Set variable *SHORTCUT_HEADERS* to specify a method for population of folder *inc* by header files. Supported methods are:
+  * *Copy* - headers will be copied from *src*;
+  * *ShortCut* - short-cut header files will be created, redirecting to same-named header located in *src*;
+  * "HardLink* - hard links to headers located in *src* will be created.
+* For optional  third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*,  e.g.:
+~~~~~
+       export HAVE_GL2PS=false
+~~~~~
+
+Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure
+ environment interactively:
+
+@figure{/build/build_occt/images/genconf_linux.png}
+
+Click "Save" to store the specified configuration in *custom.sh* or *custom.bat* file.
+  
+<h2>Generate Projects</h2>
+
+Launch **genproj** tool with option *cbp* to update content of *inc* folder and generate project files after changes in 
+OCCT code affecting layout or composition of source files:
+
+~~~~~
+  $ cd /dev/OCCT/opencascade-7.0.0
+  $ ./genproj cbp
+~~~~~
+
+The generated Code::Blocks project are placed into subfolder *adm/&lt;OS&gt;/cbp*.
+
+@note To use **genproj** and **genconf** tools you need to have Tcl installed and accessible by PATH.
+
+<h2>Build</h2>
+
+To start **Code::Blocks**, launch script *codeblocks.sh*.
+
+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, run the script
+~~~~~
+   ./draw_cbp.sh cbp [d]
+~~~~~
+Option *d* is used if OCCT has been built in **Debug** mode.

dox/build/build_upgrade.md

@@ -0,0 +1,10 @@
+Build, Debug and Upgrade {#build_upgrade}
+=================
+
+This chapter contains the detailed infomation about building, debugging and upgrade procedures:
+
+* @subpage build_upgrade__building_occt
+* @subpage build_upgrade_building_3rdparty
+* @subpage build_upgrade__building_documentation
+* @subpage occt__debug
+* @subpage occt__upgrade

dox/contribution/coding_rules.md

@@ -1,4 +1,4 @@
-Coding Rules {#occt_dev_guides__coding_rules}
+Coding Rules {#occt_contribution__coding_rules}
 ======================================
 
 @tableofcontents

dox/contribution/contribution.md

@@ -0,0 +1,10 @@
+Contribution {#contribution}
+============
+
+This chapter contains the detailed infomation about contribution procedure:
+
+* @subpage occt_contribution__contribution_workflow
+* @subpage occt_contribution__git_guide
+* @subpage occt_contribution__coding_rules
+* @subpage occt_contribution__tests
+* @subpage occt_contribution__documentation

dox/contribution/contribution_workflow/contribution_workflow.md

@@ -1,4 +1,4 @@
-Contribution Workflow {#occt_dev_guides__contribution_workflow}
+Contribution Workflow {#occt_contribution__contribution_workflow}
 ====================================
 @tableofcontents 
 
@@ -10,7 +10,7 @@ The purpose of this document is to describe standard workflow for processing con
 
 Each contribution should have corresponding issue (bug, or feature, or integration request) 
 registered in the MantisBT issue tracker system accessible by URL 
-http://tracker.dev.opencascade.org. 
+https://tracker.dev.opencascade.org.
 The issue is processed according to the described workflow.
 
 @subsection occt_contribution_intro_access Access levels
@@ -144,7 +144,7 @@ Change of layout or re-formatting of the existing code is allowed only in the pa
 
 @note If deemed useful, re-formatting or cosmetic changes affecting considerable parts of the code can be made within a dedicated issue.
 
-The changes should comply with the OCCT @ref occt_dev_guides__coding_rules "Codng Rules". 
+The changes should comply with the OCCT @ref occt_contribution__coding_rules "Codng Rules". 
 It is especially important to comment the code properly so that other people can understand it easier.
 
 The modification should be tested by running OCCT tests (on the platform and scope available to **Developer**) and ensuring absence of regressions.
@@ -163,9 +163,9 @@ When the test case cannot be provided for any reason, the maximum possible infor
 
 If the change affects a functionality described in @ref user_guides "User Guides", the corresponding user guide should be updated to reflect the change.
 
-If the change affects OCCT test system, build environment, or development tools described in @ref dev_guides "Developer Guides", the corresponding guide should be updated.
+If the change affects OCCT test system, build environment, or development tools described in @ref build_upgrade "Build, Debug and Upgrade" or @ref contribution "Contribution", the corresponding guide should be updated.
  
-The changes that break compatibility with the previous versions of OCCT (i.e. affecting API or behavior of existing functionality in the way that may require update of existing applications based on an earlier official release of OCCT to work correctly) should be described in the document @ref occt_dev_guides__upgrade "Upgrade from previous OCCT versions".
+The changes that break compatibility with the previous versions of OCCT (i.e. affecting API or behavior of existing functionality in the way that may require update of existing applications based on an earlier official release of OCCT to work correctly) should be described in the document @ref occt__upgrade "Upgrade from previous OCCT versions".
 It is recommended to add a sub-section for each change described.
 The description should provide the explanation of the incompatibility introduced by the change, and describe how it can be resolved (at least, in known situations).
 When feasible, the automatic upgrade procedure (adm/upgrade.tcl) can be extended by a new option to perform the required upgrade of the dependent code automatically. 
@@ -183,7 +183,7 @@ In case if the fix is implemented on the previous release of OCCT, the branch ca
 The branch name should be composed of letters **CR** (abbreviation of "Change Request") followed by the issue ID number (without leading zeros). 
 It is possible to add an optional suffix to the branch name after the issue ID, e.g. to distinguish between several versions of the fix (see @ref occt_contribution_nonstd_rebase).
 
-See @ref occt_dev_guides__git_guide "Guide to using GIT" for help.
+See @ref occt_contribution__git_guide "Guide to using GIT" for help.
 
 @note When a branch with the name given according to the above rule is pushed to Git, a note is automatically added to the corresponding issue in Mantis, indicating the person who has made the push, the commit hash, and (for new commits) the description.
   
@@ -226,7 +226,7 @@ The possible variants are:
 
 @subsection occt_contribution_workflow_review Code review
 
-The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT @ref occt_dev_guides__coding_rules "Coding Rules" and examines all changes in the sources, test case(s), and documentation to detect obvious and possible errors, misprints, or violations of the coding style. 
+The **Reviewer** analyzes the proposed solution for applicability in accordance with OCCT @ref occt_contribution__coding_rules "Coding Rules" and examines all changes in the sources, test case(s), and documentation to detect obvious and possible errors, misprints, or violations of the coding style. 
 
 If the Reviewer detects some problems, he can either:
 

dox/contribution/documentation/documentation.md

@@ -1,10 +1,26 @@
- Documentation System {#occt_dev_guides__documentation}
+ Documentation System {#occt_contribution__documentation}
 ======================
 
 @tableofcontents
 
 @section  OCCT_DM_SECTION_1 Introduction
 
+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. 
+  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.
+
 This document provides practical guidelines for generation and editing of OCCT user documentation.
 
 @section  OCCT_DM_SECTION_2 Prerequisites
@@ -12,15 +28,15 @@ This document provides practical guidelines for generation and editing of OCCT u
 You need to have the following software installed to generate the documentation.
 
 **Tcl/Tk**
-Version 8.5 or 8.6: http://www.tcl.tk/software/tcltk/download.html
+Version 8.5 or 8.6: https://www.tcl.tk/software/tcltk/download.html
 
 **Doxygen**
-Version 1.8.4 or above: http://www.stack.nl/~dimitri/doxygen/download.html
+Version 1.8.4 or above: http://www.doxygen.nl/download.html
 
 **Dot**
-Part of Graphviz software, used by Doxygen for generation of class diagrams in Reference Manual: http://www.graphviz.org/Download..php
+Part of Graphviz software, used by Doxygen for generation of class diagrams in Reference Manual: https://www.graphviz.org/download/
 
-**MiKTeX** or other package providing **pdflatex** command (only needed for generation of PDF documents): http://miktex.org/download
+**MiKTeX** or other package providing **pdflatex** command (only needed for generation of PDF documents): https://miktex.org/download
 
 **Inkscape** (only needed for generation of PDF documents containing SVG images): http://www.inkscape.org/download
 
@@ -30,7 +46,7 @@ You can use *custom.bat* file to add necessary paths to the *PATH* variable.
 Note that in the process of PDF generation MiKTeX may need some packages not installed by default.
 We recommend setting option "Install missing packages on-the-fly" to "Ask me first" (default) during MiKTeX installation:
 
-@figure{/dev_guides/documentation/images/documentation_miktex.png,"",320}
+@figure{/contribution/documentation/images/documentation_miktex.png,"",320}
 
 On the first run of **pdflatex** it will open a dialog window prompting for installation of missing packages.
 Follow the instructions to proceed (define proxy settings if needed, select a mirror site to download from, etc.).
@@ -102,7 +118,7 @@ The MarkDown files have a <i>*.md</i> extension and are based on rules described
 
 @subsection  OCCT_DM_SECTION_3_2 Directory Structure
 
-@figure{/dev_guides/documentation/images/documentation_folders.png,"",160}
+@figure{/contribution/documentation/images/documentation_folders.png,"",160}
 
 Each document has its own folder if there are any images used in it. These images are stored in *images* subfolder.
 
@@ -112,7 +128,7 @@ If you want to use the same image for several documents, you can place it in *do
 
 
 @verbatim
-@figure{/dev_guides/documentation/images/documentation_test_image.svg,"",420}
+@figure{/contribution/documentation/images/documentation_test_image.svg,"",420}
 @endverbatim
 
 
@@ -122,16 +138,16 @@ The documentation is generated in subfolder *doc* :
 
 @section  OCCT_DM_SECTION_4 Adding a New Document
 
-Place a new document in the folder taking into account its logical position in the documentation hierarchy. For instance, the document *svn.md* about the use of SVN to work with OCCT source code can be placed into <i>/dox/dev_guides/</i>. 
+Place a new document in the folder taking into account its logical position in the documentation hierarchy. For instance, the document *svn.md* about the use of SVN to work with OCCT source code can be placed into <i>/dox/contribution/</i>. 
 
 If there are images in the document, it should be placed in its own folder containing a subfolder for images. For instance:
-* <i> /dox/dev_guides/svn/ </i> -- for *svn.md* file;
-* <i> /dox/dev_guides/svn/images/ </i> -- for images.
+* <i> /dox/contribution/svn/ </i> -- for *svn.md* file;
+* <i> /dox/contribution/svn/images/ </i> -- for images.
 
 Add a relative path to *svn.md* in file <i>dox/FILES.txt</i>. For instance
 
 @verbatim
-dev_guides/svn/svn.md
+contribution/svn/svn.md
 @endverbatim
 
 **Note** that the order of paths to documents in *FILES.txt* is reproduced in the Table of Contents in the HTML output, thus they need to be placed logically.
@@ -154,7 +170,7 @@ http://www.stack.nl/~dimitri/doxygen/manual
 A document file in *.md format must start with a proper header defining a caption and a unique tag.
 
 @verbatim
-Documentation System {#dev_guides__documentation}
+Documentation System {#contribution__documentation}
 =====================
 @endverbatim
 
@@ -399,12 +415,12 @@ Captions are included below the image; in PDF output the images with caption are
 Example:
 
 @verbatim
-  @figure{/dev_guides/documentation/images/documentation_test_image.svg,"Test SVG image"}
+  @figure{/contribution/documentation/images/documentation_test_image.svg,"Test SVG image"}
 @endverbatim
 
 is rendered as:
 
-@figure{/dev_guides/documentation/images/documentation_test_image.svg,"Test SVG image",320}
+@figure{/contribution/documentation/images/documentation_test_image.svg,"Test SVG image",320}
 
 We recommend using **Inkscape** for creation and edition of vector graphics.
 The graphics created in MS Word Draw and some other vector editors can be copy-pasted to Inkscape and saved as SVG images.