0026591: Header collecting in CMake configuration process does not consider 'patch' dir

"patch" functionality fixed (except mfc samples)
CMake variable descriptions updated and their width realigned

src/DRAWEXE/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   DRAWEXE
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/FWOSPlugin/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   FWOSDriver
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBO/CMakeLists.txt

@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   BOPTools
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBRep/CMakeLists.txt

@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   BinTools
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBin/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BinMNaming
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBinL/CMakeLists.txt

@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   BinLDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBinTObj/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   BinTObjDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBinXCAF/CMakeLists.txt

@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   BinMXCAFDoc
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKBool/CMakeLists.txt

@@ -10,4 +10,4 @@ set (TOOLKIT_MODULES
   BRepProj
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKCAF/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   AppStd
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKCDF/CMakeLists.txt

@@ -8,4 +8,4 @@ set (TOOLKIT_MODULES
   LDOM
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKDCAF/CMakeLists.txt

@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   DrawDim
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKDraw/CMakeLists.txt

@@ -34,4 +34,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKFeat/CMakeLists.txt

@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   BRepFeat
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKFillet/CMakeLists.txt

@@ -12,4 +12,4 @@ set (TOOLKIT_MODULES
   FilletSurf
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKG2d/CMakeLists.txt

@@ -10,4 +10,4 @@ set (TOOLKIT_MODULES
   GProp
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKG3d/CMakeLists.txt

@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   TopAbs
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKGeomAlgo/CMakeLists.txt

@@ -36,4 +36,4 @@ set (TOOLKIT_MODULES
   TopClass
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKGeomBase/CMakeLists.txt

@@ -25,4 +25,4 @@ set (TOOLKIT_MODULES
   gce
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKHLR/CMakeLists.txt

@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   Contap
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKIGES/CMakeLists.txt

@@ -21,4 +21,4 @@ set (TOOLKIT_MODULES
   IGESControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKIVtk/CMakeLists.txt

@@ -16,4 +16,4 @@ else()
   endforeach()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKIVtkDraw/CMakeLists.txt

@@ -13,4 +13,4 @@ else()
   endforeach()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKLCAF/CMakeLists.txt

@@ -8,4 +8,4 @@ set (TOOLKIT_MODULES
   AppStdL
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKMath/CMakeLists.txt

@@ -21,4 +21,4 @@ set (TOOLKIT_MODULES
   ExprIntrp
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKMesh/CMakeLists.txt

@@ -11,4 +11,4 @@ if(NOT WIN32)
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKMeshVS/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   MeshVS
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKOffset/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BiTgte
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKOpenGl/CMakeLists.txt

@@ -37,4 +37,4 @@ if (NOT WIN32)
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKPrim/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BRepPrimAPI
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKQADraw/CMakeLists.txt

@@ -21,4 +21,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKSTEP/CMakeLists.txt

@@ -20,4 +20,4 @@ if (WIN32)
   list( APPEND USED_LIBS wsock32.lib )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKSTEP209/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStepFEA
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKSTEPAttr/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStepDimTol
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKSTEPBase/CMakeLists.txt

@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   RWStepShape
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKSTL/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKService/CMakeLists.txt

@@ -55,4 +55,4 @@ if (NOT WIN32)
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKShHealing/CMakeLists.txt

@@ -17,4 +17,4 @@ if (WIN32)
   list( APPEND USED_LIBS wsock32.lib )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKTObj/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   TObj
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKTObjDRAW/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   TObjDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKTopAlgo/CMakeLists.txt

@@ -19,4 +19,4 @@ set (TOOLKIT_MODULES
   BRepApprox
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKTopTest/CMakeLists.txt

@@ -14,4 +14,4 @@ set (TOOLKIT_MODULES
   SWDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKV3d/CMakeLists.txt

@@ -34,4 +34,4 @@ else()
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKVRML/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   VrmlData
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKViewerTest/CMakeLists.txt

@@ -36,4 +36,4 @@ else()
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKVoxel/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   Voxel
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXCAF/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XCAFPrs
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXDEDRAW/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XDEDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXDEIGES/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   IGESCAFControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXDESTEP/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   STEPCAFControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXMesh/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XBRepMesh
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXSBase/CMakeLists.txt

@@ -19,4 +19,4 @@ set (TOOLKIT_MODULES
   MoniTool
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXSDRAW/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XSDRAWSTLVRML
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXml/CMakeLists.txt

@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XmlMPrsStd
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXmlL/CMakeLists.txt

@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   XmlObjMgt
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXmlTObj/CMakeLists.txt

@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XmlTObjDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKXmlXCAF/CMakeLists.txt

@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   XmlMXCAFDoc
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)

src/TKernel/CMakeLists.txt

@@ -36,4 +36,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)