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
2025-04-03 17:56:21 +03:00 · 2015-08-06 20:59:26 +03:00 · 2015-08-06 20:59:26 +03:00 · f2e9c853a2
commit f2e9c853a2
parent a7653f4f55
63 changed files with 288 additions and 159 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -6,10 +6,10 @@ set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FO

 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
-  if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
    include (${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
  else()
-    include (${BEING_INCLUDED_FILE}.cmake)
+    include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake)
  endif()
 endmacro()

@ -143,7 +143,7 @@ if ("${3RDPARTY_DIR}" STREQUAL "")
 endif()

 # search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED(CSF_TclLibs USE_TCL)
+OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)

 if ("${USE_TCL}" STREQUAL ON)
  message (STATUS "Info: tcl is used by OCCT")
@ -154,7 +154,7 @@ else()
 endif()

 # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)
+OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)

 if ("${USE_FREETYPE}" STREQUAL ON)
  message (STATUS "Info: freetype is used by OCCT")
@ -169,6 +169,9 @@ endif()
 if (USE_VTK)
  add_definitions (-DHAVE_VTK)
  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
+  OCCT_CHECK_AND_UNSET ("INSTALL_VTK")
 endif()

 # GLX
@ -227,7 +230,8 @@ if (BUILD_DOC_OcctOverview)

  if (INSTALL_DOC_OcctOverview)
    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/doc")
-    install (FILES "${CMAKE_SOURCE_DIR}/dox/resources/overview.html" DESTINATION  "${INSTALL_DIR}")
+
+    OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR}")
  endif()

  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
@ -294,8 +298,9 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")

 if (WIN32) 
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG   "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  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")
 endif()

 if ("${INSTALL_DIR}" STREQUAL "")
@ -309,13 +314,8 @@ endif()

 message (STATUS "\nInfo: Collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")

-# (!) patch is not taken into account COLLECT_AND_INSTALL_OCCT_HEADER_FILES
 # collect all the headers to <binary dir>/inc folder
-COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")
-# apply patched header files
-#if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "")
-#  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${APPLY_OCCT_PATCH_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}")
-#endif()
+COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")

 OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_DIR}")
 OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/samples")
@ -335,7 +335,7 @@ else()
 endif()

 # DRAW.BAT or DRAW.SH
-if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
+if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
  install (FILES "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
          OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 else()
@ -372,7 +372,7 @@ OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME

 if (BUILD_MODULE_OcctMfcSamples)
  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
-  OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
+  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()

 # env script for draw in building environment
@ -404,8 +404,8 @@ install (FILES "${CMAKE_BINARY_DIR}/env.install.relwithdebinfo.${SCRIPT_EXT}"
         RENAME "env.${SCRIPT_EXT}")

 # copy DrawAppliInit from OCCT source to build directory
-if (EXISTS "${CMAKE_SOURCE_DIR}/DrawAppliInit" AND NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
-  file (COPY "${CMAKE_SOURCE_DIR}/DrawAppliInit" DESTINATION "${CMAKE_BINARY_DIR}")
+if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
+  OCCT_COPY_FILE_OR_DIR (DrawAppliInit "${CMAKE_BINARY_DIR}")
 endif()

 # RESOURCES
@ -422,17 +422,11 @@ endforeach()

 # include patched toolkit projects or original ones
 foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
-  if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${BUILD_TOOLKIT}")
-    add_subdirectory(${APPLY_OCCT_PATCH_DIR}/src/${BUILD_TOOLKIT})
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${BUILD_TOOLKIT}")
-    add_subdirectory (${CMAKE_SOURCE_DIR}/src/${BUILD_TOOLKIT})
-  else()
-    message (STATUS "${BUILD_TOOLKIT} is not included")
-  endif()
+  OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")
 endforeach()

 if (BUILD_DOC_OcctOverview)
-  add_subdirectory (dox)
+  OCCT_ADD_SUBDIRECTORY (dox)
 endif()

 # patch DRAWEXE
@ -452,7 +446,7 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
      set (X_COMPILER_BITNESS "Win32")
    endif()

-    configure_file (${CMAKE_SOURCE_DIR}/adm/templates/DRAWEXE.vcxproj.user.in ${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user @ONLY)
+    OCCT_CONFIGURE ("adm/templates/DRAWEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user")
  endif()
 endif()

--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@ -80,6 +80,29 @@ function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
 endfunction()

+function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
+
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
+    file (GLOB FOUND_FILES "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
+  endif()
+
+  file (GLOB ORIGIN_FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
+  foreach (ORIGIN_FILE ${ORIGIN_FILES})
+    # check for existence of patched version of current file
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
+      get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME)
+      if (EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
+        continue()
+      endif()
+    endif()
+
+    # append origin version if patched one is not found
+    list (APPEND FOUND_FILES ${ORIGIN_FILE})
+  endforeach()
+
+  set (${RESULT} ${FOUND_FILES} PARENT_SCOPE)
+endfunction()
+
 function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
  OCCT_MAKE_COMPILER_SHORT_NAME()
  OCCT_MAKE_COMPILER_BITNESS()
@ -147,17 +170,27 @@ macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME
  install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION  "${DESTINATION_PATH}" RENAME ${INSTALL_NAME})
 endmacro()

-macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
+macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
  set (OCCT_SOURCE_DIRS)

+  # consider patched header.in template
+  set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in")
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
+    set (TEMPLATE_HEADER_PATH "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
+  endif()
+
+  set (ROOT_OCCT_DIR ${CMAKE_SOURCE_DIR})
+
  foreach (OCCT_USED_TOOLKIT ${OCCT_BUILD_TOOLKITS})
    # append parent folder
    list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT})

    # append all required package folders
    set (OCCT_USED_TOOLKIT_DEPS)
-    if (EXISTS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
    endif()

    foreach (OCCT_USED_TOOLKIT_DEP ${OCCT_USED_TOOLKIT_DEPS})
@ -166,9 +199,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH
  endforeach()

  foreach (OCCT_SOURCE_DIR ${OCCT_SOURCE_DIRS})
-    # get all header files from each src folder 
-    file (GLOB OCCT_HEADER_FILES "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
-
+    # get all header files from each src folder
+    file (GLOB OCCT_HEADER_FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
    install (FILES ${OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")

    # create new file including found header
@ -176,12 +208,26 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH
      get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
      configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
    endforeach()
+
+    # consider pathed the source files
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}")
+      file (GLOB PATCHED_OCCT_HEADER_FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
+      install (FILES ${PATCHED_OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
+
+      # create new patched file including found header
+      foreach (OCCT_HEADER_FILE ${PATCHED_OCCT_HEADER_FILES})
+        get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
+        configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
+      endforeach()
+    endif()
  endforeach()
 endmacro()

 macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
  # first of all, copy original files
-  file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}")
+    file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  endif()

  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_COPIED_OBJECT}")
    # secondly, rewrite original files with patched ones
@ -197,6 +243,16 @@ macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
  endif()
 endmacro()

+macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY)
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+    add_subdirectory(${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY})
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+    add_subdirectory (${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY})
+  else()
+    message (STATUS "${BEING_ADDED_DIRECTORY} directory is not included")
+  endif()
+endmacro()
+
 function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
  set (${USE_PRODUCT} OFF PARENT_SCOPE)

--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@ -1,26 +1,11 @@
 # script for each OCCT toolkit

 # Get all used packages from toolkit
-foreach (TOOLKIT_MODULE ${TOOLKIT_MODULES})
+foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
  if (WIN32)
-    list (APPEND PRECOMPILED_DEFS "-D__${TOOLKIT_MODULE}_DLL")
+    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
  endif()
-  list (APPEND COMPILER_DIRECTORIES "${OCCT_SOURCE_DIR}/src/${TOOLKIT_MODULE}")
-endforeach()
-string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
-
-# Get from toolkits EXTERNLIB all used libs
-OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
-foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
-  IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
-  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
-    list (APPEND USED_LIBS "${PROJECT_DEP}")
-  endif()
-endforeach()
-
-# Get all source files from used packages
-foreach (CMP_DIR ${COMPILER_DIRECTORIES})
-  get_filename_component (CMP_DIR_NAME ${CMP_DIR} NAME)
+  # ${OCCT_SOURCE_DIR}/src/${OCCT_PACKAGE}

  set (SOURCE_FILES)
  set (HEADER_FILES)
@ -29,12 +14,12 @@ foreach (CMP_DIR ${COMPILER_DIRECTORIES})
  if (${REBUILD_PLATFORM_DEPENDENT_CODE})

    # flex files
-    file (GLOB SOURCE_FILES_FLEX "${CMP_DIR}/*[.]lex") 
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
    list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
    list (SORT SOURCE_FILES_FLEX)

    # bison files
-    file (GLOB SOURCE_FILES_BISON "${CMP_DIR}/*[.]yacc") 
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
    list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
    list (SORT SOURCE_FILES_BISON)

@ -64,30 +49,64 @@ foreach (CMP_DIR ${COMPILER_DIRECTORIES})
    endif()
  endif()

-  # header files 
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+  # header files
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  else()
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
+
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  endif()
+  
  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
-
-  foreach(HEADER_FILE ${HEADER_FILES})
-    list (APPEND USED_INCFILES ${CMP_DIR}/${HEADER_FILE})
-    SOURCE_GROUP ("Header Files\\${CMP_DIR_NAME}" FILES ${CMP_DIR}/${HEADER_FILE})
-  endforeach()
-
-  # source files
-  file (STRINGS "${CMP_DIR}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
  list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
-
  if(APPLE)
-    file (STRINGS "${CMP_DIR}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
    list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
  endif()

-  foreach(SOURCE_FILE ${SOURCE_FILES})
-    list (APPEND USED_SRCFILES ${CMP_DIR}/${SOURCE_FILE})
-    SOURCE_GROUP ("Source Files\\${CMP_DIR_NAME}" FILES ${CMP_DIR}/${SOURCE_FILE})
+  foreach(HEADER_FILE ${HEADER_FILES})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      list (APPEND USED_INCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    else()
+      list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    endif()
  endforeach()
+
+  foreach(SOURCE_FILE ${SOURCE_FILES})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      list (APPEND USED_SRCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    else()
+      list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    endif()
+  endforeach()
+endforeach()
+string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
+
+# Get from toolkits EXTERNLIB all used libs
+OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
+foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
+  IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
+  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
+    list (APPEND USED_LIBS "${PROJECT_DEP}")
+  endif()
 endforeach()

 # Create project for toolkit
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@ -1,47 +1,106 @@
 # variable description

 # 
-set (APPLY_OCCT_PATCH_DIR_DESCR "The directory contaning patched OCCT sources that should be used")
-set (BUILD_LIBRARY_TYPE_DESCR "The type of further OCCT libraries: shared or static")
+set (APPLY_OCCT_PATCH_DIR_DESCR 
+"Points to the directory recognized as a 'patch' for OCCT. If specified,
+the files from this directory take precedence over the corresponding native
+OCCT sources. This way you are able to introduce patches to Open CASCADE
+Technology not affecting the original source distribution")

-set (REBUILD_PLATFORM_DEPENDENT_CODE_DESCR "OCCT has already compiled platform-depending code and it can be rebult once again (*.yacc/*.lex)")
+
+set (BUILD_LIBRARY_TYPE_DESCR 
+"Specifies the type of library to be created. 'Shared' libraries
+are linked dynamically and loaded at runtime. 'Static' libraries
+are archives of object files for use when linking other targets")
+
+set (REBUILD_PLATFORM_DEPENDENT_CODE_DESCR 
+"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
+ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
+leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")

 # install variables
-set (INSTALL_DIR_DESCR "The place where built OCCT libraries, headers, test cases (INSTALL_OCCT_TEST_CASES variable), \n samples (INSTALL_OCCT_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and other similar variables) \n will be placed during the installation process (building INSTALL project)")
+set (INSTALL_DIR_DESCR 
+"The place where built OCCT libraries, headers, test cases (INSTALL_OCCT_TEST_CASES variable),
+samples (INSTALL_OCCT_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
+other similar variables) will be placed during the installation process (building INSTALL project)")

-set (INSTALL_OCCT_SAMPLES_DESCR "The installation process (building INSTALL project) also places OCCT samples into installation directory (INSTALL_DIR variable)")
-set (INSTALL_OCCT_TEST_CASES_DESCR "The installation process (building INSTALL project) also places OCCT test cases into installation directory (INSTALL_DIR variable)")
-set (INSTALL_DOC_OcctOverview_DESCR "The installation process (building INSTALL project) also places OCCT overview documentation (HTML format) \n into installation directory (INSTALL_DIR variable)") 
+macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
+set (${INSTALL_TARGET_VARIABLE}_DESCR
+"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
+project) into the installation directory (INSTALL_DIR variable)")
+endmacro()

-set (INSTALL_FREEIMAGE_DESCR "The installation process (building INSTALL project) also places FreeImage library \n into installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_FREEIMAGEPLUS_DESCR "The installation process (building INSTALL project) also places FreeImagePlus library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_FREETYPE_DESCR "The installation process (building INSTALL project) also places FreeType library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_GL2PS_DESCR "The installation process (building INSTALL project) also places GL2PS library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_TBB_DESCR "The installation process (building INSTALL project) also places tbb and tbbmalloc libraries into \n installation directory (INSTALL_DIR variable). After that OCCT can use these libraries in portable mode")
-set (INSTALL_TCL_DESCR "The installation process (building INSTALL project) also places Tcl (library and its nessecary sources) into \n installation directory (INSTALL_DIR variable). After that OCCT can use Tcl in portable mode")
-set (INSTALL_VTK_DESCR "The installation process (building INSTALL project) also places Vtk libraries into \n installation directory (INSTALL_DIR variable). After that OCCT can use these libraries in portable mode")
+INSTALL_MESSAGE (INSTALL_OCCT_SAMPLES     "OCCT samples")
+INSTALL_MESSAGE (INSTALL_OCCT_TEST_CASES  "non-regression OCCT test scripts")
+INSTALL_MESSAGE (INSTALL_DOC_OcctOverview "OCCT overview documentation (HTML format)")
+INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_FREEIMAGEPLUS    "FreeImagePlus binaries")
+INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
+INSTALL_MESSAGE (INSTALL_GL2PS            "GL2PS binaries")
+INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
+INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")

 # build variables
-set (BUILD_MODULE_ApplicationFramework_DESCR "Build all toolkits of ApplicationFramework module in the solution")
-set (BUILD_MODULE_DataExchange_DESCR "Build all toolkits of DataExchange module in the solution")
-set (BUILD_MODULE_Draw_DESCR "Build all toolkits of Draw module in the solution")
-set (BUILD_MODULE_FoundationClasses_DESCR "Build all toolkits of FoundationClasses module in the solution")
-set (BUILD_MODULE_ModelingAlgorithms_DESCR "Build all toolkits of ModelingAlgorithms module in the solution")
-set (BUILD_MODULE_ModelingData_DESCR "Build all toolkits of ModelingData module in the solution")
-set (BUILD_MODULE_Visualization_DESCR "Build all toolkits of Visualization module in the solution")
+macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
+set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
+"Indicates whether ${BUILD_MODULE_TARGET_STRING} module should be built or not.
+It should be noted that some toolkits of the module can be built even if this module
+is not checked (this happens if some other modules depend on these toolkits)")
+endmacro()

-set (BUILD_ADDITIONAL_TOOLKITS_DESCR "Build additional OCCT toolkits (including dependent ones) in the solution")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")

-set (BUILD_MODULE_OcctMfcSamples_DESCR "Build several OCCT MFC sample projects in the solution. \n These samples show some possibilities of using OCCT and they can \n be executed with script samples.bat from the installation directory (INSTALL_DIR)")
-set (BUILD_DOC_OcctOverview_DESCR "Build a project containing OCCT overview documentation (Markdown format) \n in the solution. The building of the project executes doxygen command that generates \n the documentation in HTML format. The documentation will be available in the installation \n directory (overview.bat script) if INSTALL_DOC_OcctOverview variable is checked")

-set (3RDPARTY_DIR_DESCR "The directory that contain several or all used 3rdparties. \n If the 3rdpartyies have been found - corresponding CMake variables \n will be specified (VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
+set (BUILD_ADDITIONAL_TOOLKITS_DESCR
+"Semicolon-separated individual toolkits to include into build process. If you
+want to build some particular libraries (toolkits) only, then you may uncheck
+all modules in the corresponding BUILD_MODUE_* options and provide the list of
+necessary libraries here. Of course, all dependencies will be resolved automatically")

-set (USE_FREEIMAGE_DESCR "The solution can use FreeImage")
-set (USE_GL2PS_DESCR "The solution can use GL2PS")
-set (USE_TBB_DESCR "The solution can use tbb")
-set (USE_VTK_DESCR "The solution can use VTK")
-set (USE_GLX_DESCR "The solution can use X11 OpenGl on OSX")
+set (BUILD_MODULE_OcctMfcSamples_DESCR
+"Indicates whether OCCT MFC samples should be built together with OCCT.
+These samples show some possibilities of using OCCT and they can be executed
+with script samples.bat from the installation directory (INSTALL_DIR)")
+
+set (BUILD_DOC_OcctOverview_DESCR
+"Indicates whether OCCT overview documentation project (Markdown format) should be
+created together with OCCT. It is not built together with OCCT. Checking this options
+leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command
+to generate the documentation in HTML format. The documentation will be available in the
+installation directory (overview.bat script) if INSTALL_DOC_OcctOverview variable is checked")
+
+set (3RDPARTY_DIR_DESCR
+"The root directory where all required 3-rd party products will be searched. If a
+3-rd party product have been found - corresponding CMake variables will be specified
+(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
+
+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_GL2PS_DESCR
+"Indicates whether GL2PS product should be used in OCCT visualization
+module for support of vector image formats (PS, EPS etc)")
+
+set (USE_TBB_DESCR
+"Indicates whether TBB 3-rd 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")
+
+set (USE_VTK_DESCR
+"Indicates whether VTK 3-rd 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).")
+
+set (USE_GLX_DESCR "Indicates whether X11 OpenGl on OSX is used or not")

 macro (BUILD_MODULE MODULE_NAME)
  set (BUILD_MODULE_${MODULE_NAME} ON CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@ -117,7 +117,8 @@ The following table enumerates the full list of environment variables used at co
 | INSTALL_TBB | Boolean flag | Indicates whether TBB binaries should be installed into the installation directory |
 | INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
 | INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
-| INSTALL_OCCT_SAMPLES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_OCCT_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_OCCT_SAMPLES | Boolean flag | Indicates whether OCCT samples should be installed into the installation directory |
 | INSTALL_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |

 **Note:** In those CMake options defining paths only the forward slashes ("/") are acceptable.
--- a/src/DRAWEXE/CMakeLists.txt
+++ b/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)
--- a/src/FWOSPlugin/CMakeLists.txt
+++ b/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)
--- a/src/TKBO/CMakeLists.txt
+++ b/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)
--- a/src/TKBRep/CMakeLists.txt
+++ b/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)
--- a/src/TKBin/CMakeLists.txt
+++ b/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)
--- a/src/TKBinL/CMakeLists.txt
+++ b/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)
--- a/src/TKBinTObj/CMakeLists.txt
+++ b/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)
--- a/src/TKBinXCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKBool/CMakeLists.txt
+++ b/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)
--- a/src/TKCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKCDF/CMakeLists.txt
+++ b/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)
--- a/src/TKDCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKDraw/CMakeLists.txt
+++ b/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)
--- a/src/TKFeat/CMakeLists.txt
+++ b/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)
--- a/src/TKFillet/CMakeLists.txt
+++ b/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)
--- a/src/TKG2d/CMakeLists.txt
+++ b/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)
--- a/src/TKG3d/CMakeLists.txt
+++ b/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)
--- a/src/TKGeomAlgo/CMakeLists.txt
+++ b/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)
--- a/src/TKGeomBase/CMakeLists.txt
+++ b/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)
--- a/src/TKHLR/CMakeLists.txt
+++ b/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)
--- a/src/TKIGES/CMakeLists.txt
+++ b/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)
--- a/src/TKIVtk/CMakeLists.txt
+++ b/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)
--- a/src/TKIVtkDraw/CMakeLists.txt
+++ b/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)
--- a/src/TKLCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKMath/CMakeLists.txt
+++ b/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)
--- a/src/TKMesh/CMakeLists.txt
+++ b/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)
--- a/src/TKMeshVS/CMakeLists.txt
+++ b/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)
--- a/src/TKOffset/CMakeLists.txt
+++ b/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)
--- a/src/TKOpenGl/CMakeLists.txt
+++ b/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)
--- a/src/TKPrim/CMakeLists.txt
+++ b/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)
--- a/src/TKQADraw/CMakeLists.txt
+++ b/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)
--- a/src/TKSTEP/CMakeLists.txt
+++ b/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)
--- a/src/TKSTEP209/CMakeLists.txt
+++ b/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)
--- a/src/TKSTEPAttr/CMakeLists.txt
+++ b/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)
--- a/src/TKSTEPBase/CMakeLists.txt
+++ b/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)
--- a/src/TKSTL/CMakeLists.txt
+++ b/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)
--- a/src/TKService/CMakeLists.txt
+++ b/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)
--- a/src/TKShHealing/CMakeLists.txt
+++ b/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)
--- a/src/TKTObj/CMakeLists.txt
+++ b/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)
--- a/src/TKTObjDRAW/CMakeLists.txt
+++ b/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)
--- a/src/TKTopAlgo/CMakeLists.txt
+++ b/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)
--- a/src/TKTopTest/CMakeLists.txt
+++ b/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)
--- a/src/TKV3d/CMakeLists.txt
+++ b/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)
--- a/src/TKVRML/CMakeLists.txt
+++ b/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)
--- a/src/TKViewerTest/CMakeLists.txt
+++ b/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)
--- a/src/TKVoxel/CMakeLists.txt
+++ b/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)
--- a/src/TKXCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKXDEDRAW/CMakeLists.txt
+++ b/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)
--- a/src/TKXDEIGES/CMakeLists.txt
+++ b/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)
--- a/src/TKXDESTEP/CMakeLists.txt
+++ b/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)
--- a/src/TKXMesh/CMakeLists.txt
+++ b/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)
--- a/src/TKXSBase/CMakeLists.txt
+++ b/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)
--- a/src/TKXSDRAW/CMakeLists.txt
+++ b/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)
--- a/src/TKXml/CMakeLists.txt
+++ b/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)
--- a/src/TKXmlL/CMakeLists.txt
+++ b/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)
--- a/src/TKXmlTObj/CMakeLists.txt
+++ b/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)
--- a/src/TKXmlXCAF/CMakeLists.txt
+++ b/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)
--- a/src/TKernel/CMakeLists.txt
+++ b/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)