0025114: CMake-based build tools for OCCT 7.0

All CMake meta-projects for OCCT are put to OCCT code (including fragments previously generated by WOK).

"/bigobj" compiler flag added to TKQADraw because of the size of its object file

[GeomToStep & Graphic3d] private headers are included from current dir of including source file

.gitignore

@@ -28,7 +28,6 @@ Release
 /adm/lin
 /adm/mac
 /adm/make
-/adm/cmake
 *.vcproj*user
 *.csproj*user
 *.ncb

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
+cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
 
 set (CMAKE_SUPPRESS_REGENERATION TRUE)
 
@@ -28,16 +28,48 @@ project (OCCT)
 # Solution folder property
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
+# Generate documentation
+# Overview and User Guides
+set (DOC_GENERATE_OVERVIEW OFF CACHE BOOL "Generate Overview and User Guides")
+if (NOT DOC_OVERVIEW_OUTPUT_FORMAT)
+  set (DOC_OVERVIEW_OUTPUT_FORMAT "html" CACHE STRING "Output format of Overview and User Guides" FORCE)
+  SET_PROPERTY (CACHE DOC_OVERVIEW_OUTPUT_FORMAT PROPERTY STRINGS html chm pdf)
+endif()
+# class Reference Manual
+set (DOC_GENERATE_REFMAN OFF CACHE BOOL "Generate class Reference Manual")
+
+# Tests
+set (TESTS_RUN OFF CACHE BOOL "Run tests or not")
+set (TESTS_INSTALL OFF CACHE BOOL "Copy tests to folder install")
+set (TESTS_SHAPES_DIR "" CACHE PATH "Directory that will contain shapes for tests" )
+
+# Find Bison and Flex executables to rebuild *.yacc and *.lex files if it is necessary (BUILD_BISON_FLEX_FILES is ON)
+set (BUILD_BISON_FLEX_FILES OFF CACHE BOOL "Build *.yacc/*.lex files")
+if (${BUILD_BISON_FLEX_FILES})
+  foreach (aTool BISON FLEX)
+    list (APPEND CMAKE_PROGRAM_PATH ${BUILD_BISON_FLEX_DIR})
+    find_package (${aTool})
+    if (NOT ${${aTool}_FOUND})
+      message ("Warning : set BUILD_BISON_FLEX_DIR directory")
+      set (BUILD_BISON_FLEX_DIR "" CACHE PATH "Filepath to BISON and FLEX executables")
+      set (BUILD_BISON_FLEX_FILES OFF)
+    endif()
+  endforeach()
+endif()
+
+# group include files in folder install
+set (INSTALL_GROUP_INC ON CACHE BOOL "In include files grouped in install folder")
+
+# copy samples to install directory
+set (INSTALL_SAMPLES OFF CACHE BOOL "Copy samples to install directory")
+
 set (CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
 
 # install dir of the built project
 set (INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
 set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
 
-# whether install test bundle or not
+set (BUILD_PATCH_DIR "" CACHE PATH "directory with occt patch")
-set (INSTALL_TESTS OFF CACHE BOOL "Is tests copy to install directory")
-
-set (BUILD_PATCH_DIR "" CACHE PATH "directory with OCCT patch")
 
 # the list of being built toolkits
 set (BUILD_TOOLKITS "" CACHE STRING "Toolkits are also included in OCCT")
@@ -58,34 +90,68 @@ set (USE_VTK OFF CACHE BOOL "Is VTK used or not")
 if (NOT DEFINED ANDROID)
   set (USE_GL2PS OFF CACHE BOOL "Is gl2ps used or not")
   set (USE_TBB OFF CACHE BOOL "Is tbb used or not")
-  set (USE_OPENCL OFF CACHE BOOL "Is OpenCL used or not")
+  #set (USE_OPENCL OFF CACHE BOOL "Is OpenCL used or not")
 endif()
 
 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
   if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
-    include(${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
+    include (${BUILD_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
   else()
-    include(${BEING_INCLUDED_FILE}.cmake)
+    include (${BEING_INCLUDED_FILE}.cmake)
   endif()
 endmacro()
 
 # include occt macros
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 # BUILD_POSTFIX variable is used by all toolkit cmakelists.txt projects
 OCCT_MAKE_BUILD_POSTFIX()
 
 # include the patched or original list of modules
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_modules")
+# list <MODULENAME>_TOOLKITS is created foreach module and contains its toolkits
+# list <OCCT_MODULES> will contain all modules
+OCCT_MODULES_AND_TOOLKITS (OCCT_MODULES)
 
-# include the list of being used toolkits. USED_TOOLKITS variable
+foreach (MODULE ${OCCT_MODULES})
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_toolkits")
+  set (BUILD_${MODULE} ON CACHE BOOL "include ${MODULE}")
+endforeach()
+
+if (NOT USE_VTK)
+  list (REMOVE_ITEM Visualization_TOOLKITS TKIVtk)
+  list (REMOVE_ITEM Draw_TOOLKITS TKIVtkDraw)
+endif()
+
+# accumulate used toolkits (first level) in USED_TOOLKITS variable
+list (APPEND USED_TOOLKITS ${BUILD_TOOLKITS})
+
+foreach (MODULE ${OCCT_MODULES})
+  if (BUILD_${MODULE})
+    list (APPEND USED_TOOLKITS ${${MODULE}_TOOLKITS})
+  endif()
+endforeach()
+
+# DRAWEXE excluded when library build is static
+if (NOT BUILD_SHARED_LIBS)
+  list (REMOVE_ITEM USED_TOOLKITS DRAWEXE)
+  message (STATUS "Info: DRAWEXE is not included due to ${BUILD_LIBRARY_TYPE} build library type")
+endif()
+
+# accumulate all used toolkits
+list (REMOVE_DUPLICATES USED_TOOLKITS)
+set (RAW_USED_TOOLKIT)
+foreach(USED_TOOLKIT ${USED_TOOLKITS})
+  OCCT_TOOLKIT_FULL_DEP (${USED_TOOLKIT} TOOLKIT_FULL_DEPS)
+  list (APPEND RAW_USED_TOOLKIT ${USED_TOOLKIT} ${TOOLKIT_FULL_DEPS})
+endforeach()
+
+list (REMOVE_DUPLICATES RAW_USED_TOOLKIT)
+set (USED_TOOLKITS ${RAW_USED_TOOLKIT})
 
 # include the patched or original list of definitions and flags
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_defs_flags")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags")
 
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/3rdparty_macro")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")
 
 set (3RDPARTY_DIR_LABEL "The directory containing required 3rdparty products")
 if (NOT DEFINED 3RDPARTY_DIR)
@@ -108,7 +174,7 @@ OCCT_IS_PRODUCT_REQUIRED(CSF_TclLibs USE_TCL)
 
 if ("${USE_TCL}" STREQUAL ON)
   message (STATUS "Info: tcl is used by OCCT")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tcl")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TCL")
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TK")
@@ -119,7 +185,7 @@ OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)
 
 if ("${USE_FREETYPE}" STREQUAL ON)
   message (STATUS "Info: freetype is used by OCCT")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freetype")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
   OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
@@ -129,20 +195,20 @@ endif()
 # VTK
 if (USE_VTK)
   add_definitions (-DHAVE_VTK)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/vtk")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
 endif()
 
 # GLX
 if (USE_GLX)
   add_definitions (-DMACOSX_USE_GLX)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/glx")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/glx")
 endif()
 
 # FREEIMAGE
 if (USE_FREEIMAGE)
   add_definitions (-DHAVE_FREEIMAGE)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimage")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimageplus")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimageplus")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGEPLUS")
@@ -153,27 +219,27 @@ endif()
 # GL2PS
 if (USE_GL2PS)
   add_definitions (-DHAVE_GL2PS)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/gl2ps")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
   OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
 endif()
 
 # OPENCL
-if (USE_OPENCL)
+#if (USE_OPENCL)
-  add_definitions (-DHAVE_OPENCL)
+#  add_definitions (-DHAVE_OPENCL)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/opencl")
+#  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/opencl")
-else()
+#else()
-  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
+#  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
-  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
+#  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
-  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
+#  OCCT_CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
-  OCCT_CHECK_AND_UNSET ("INSTALL_OPENCL")
+#  OCCT_CHECK_AND_UNSET ("INSTALL_OPENCL")
-endif()
+#endif()
 
 # TBB
 if (USE_TBB)
   add_definitions (-DHAVE_TBB)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tbb")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
@@ -201,21 +267,43 @@ if (3RDPARTY_LIBRARY_DIRS)
   link_directories (${3RDPARTY_LIBRARY_DIRS})
 endif()
 
+# Get all used variables: OS_WITH_BIT, COMPILER, BUILD_POSTFIX
 OCCT_MAKE_BUILD_POSTFIX()
+OCCT_MAKE_OS_WITH_BITNESS()
+OCCT_MAKE_COMPILER_SHORT_NAME()
 
 # build directories
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
+string (TOUPPER "${BUILD_CONFIGURATION}" TAIL_OF_OUTPUT_VARNAME)
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib${BUILD_POSTFIX})
+
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin${BUILD_POSTFIX})
+set (OUTPUT_LIBRARY_DIR ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX})
+set (OUTPUT_BINARY_DIR ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX})
+
+set ("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${TAIL_OF_OUTPUT_VARNAME}" "${OUTPUT_LIBRARY_DIR}")
+set ("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${TAIL_OF_OUTPUT_VARNAME}" "${OUTPUT_BINARY_DIR}")
+set ("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${TAIL_OF_OUTPUT_VARNAME}" "${OUTPUT_LIBRARY_DIR}")
+
+if (WIN32)
+  set ("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${TAIL_OF_OUTPUT_VARNAME}" "${OUTPUT_BINARY_DIR}")
+endif()
 
 if ("${INSTALL_DIR}" STREQUAL "")
   message (FATAL_ERROR "INSTALL_DIR variable is empty. It's required to define installation directory")
 else()
+
   # inc,data,tests DIRECTORY
-  install (DIRECTORY "${CMAKE_SOURCE_DIR}/inc"          DESTINATION  "${INSTALL_DIR}")
+  file (GLOB DIRS RELATIVE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/*)
+  foreach(CDIR ${DIRS})
+    file(GLOB HFiles "${CMAKE_SOURCE_DIR}/src/${CDIR}/*.[hgl]xx" "${CMAKE_SOURCE_DIR}/src/${CDIR}/*.h")
+    set (GROUP_CDIR "")
+    if (INSTALL_GROUP_INC)
+      set (GROUP_CDIR ${CDIR})
+    endif()
+    install(FILES ${HFiles} DESTINATION "${INSTALL_DIR}/inc/${GROUP_CDIR}")
+  endforeach(CDIR)
+
   install (DIRECTORY "${CMAKE_SOURCE_DIR}/data"         DESTINATION  "${INSTALL_DIR}")
   install (DIRECTORY "${CMAKE_SOURCE_DIR}/samples/tcl"  DESTINATION  "${INSTALL_DIR}/samples")
-  if (INSTALL_TESTS)
+  if (TESTS_INSTALL)
     install (DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
   endif()
 
@@ -223,15 +311,25 @@ else()
   if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
     if (EXISTS "${BUILD_PATCH_DIR}/inc")
       install (DIRECTORY "${BUILD_PATCH_DIR}/inc" DESTINATION  "${INSTALL_DIR}" )
+    else()
+      file (GLOB DIRS RELATIVE ${BUILD_PATCH_DIR}/src ${BUILD_PATCH_DIR}/src/*)
+      foreach(CDIR ${DIRS})
+        file(GLOB HFiles "${BUILD_PATCH_DIR}/src/${CDIR}/*.[hgl]xx" "${BUILD_PATCH_DIR}/src/${CDIR}/*.h")
+        if (INSTALL_GROUP_INC)
+          install(FILES ${HFiles} DESTINATION "${INSTALL_DIR}/inc/${CDIR}")
+        else()
+          install(FILES ${HFiles} DESTINATION "${INSTALL_DIR}/inc")
+        endif()
+      endforeach(CDIR)
     endif()
 
     if (EXISTS "${BUILD_PATCH_DIR}/data")
       install (DIRECTORY "${BUILD_PATCH_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
     endif()
 
-    if (INSTALL_TESTS)
+    if (TESTS_INSTALL)
       if (EXISTS "${BUILD_PATCH_DIR}/tests")
-        install (DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
+        install (DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION "${INSTALL_DIR}" )
       endif()
     endif()
   endif()
@@ -242,29 +340,48 @@ else()
     set (SCRIPT_EXT sh)
   endif()
 
-  # DRAW.BAT or DRAW.SH
+  # Creation of "START_TESTS" project
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
+  if (TESTS_RUN AND TESTS_INSTALL)
-    install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+    #set(BUILD_TESTING ON)
-            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+    #enable_testing ()
-  ELSE()
+    #add_test(NAME RUN_TESTS COMMAND ${INSTALL_DIR}/draw.${SCRIPT_EXT} -c testgrid -overwrite -outdir ${INSTALL_DIR}/TestResults)
-    install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+    add_custom_target(START_TESTS ${INSTALL_DIR}/draw.${SCRIPT_EXT} -c testgrid -overwrite -outdir ${INSTALL_DIR}/TestResults DEPENDS INSTALL)
-            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  ENDIF()
-
-  # set compiler short name
-  OCCT_MAKE_COMPILER_SHORT_NAME()
-
-  OCCT_MAKE_COMPILER_BITNESS()
-
-  SET(SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_POSTFIX}.${SCRIPT_EXT}")
-
-  if (WIN32)
-    SET (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM}\" (\n  call \"%~dp0${SUB_CUSTOM}\" %1 %2 %3 \n)")
-  else()
-    SET (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
   endif()
 
-  # change custom.bat/sh
+  # Creation of "GenerateDocumentation" project
+  if (DOC_GENERATE_OVERVIEW OR DOC_GENERATE_REFMAN)
+    OCCT_INCLUDE_CMAKE_FILE("adm/cmake/occt_gendoc")
+    if(DOC_GENERATE_OVERVIEW)
+      gendoc(-overview -${DOC_OVERVIEW_OUTPUT_FORMAT})
+    endif()
+    if(DOC_GENERATE_REFMAN)
+      gendoc(-refman -html)
+    endif()
+  endif()
+
+
+  # DRAW.BAT or DRAW.SH
+  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
+    install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+  else()
+    install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
+            OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+  endif()
+  OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
+
+  set (SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
+  if ("${BUILD_CONFIGURATION}" STREQUAL "Debug")
+    set (SUB_CUSTOM "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_POSTFIX}.${SCRIPT_EXT}")
+  endif()
+
+  if (WIN32)
+    set (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM}\" (\n  call \"%~dp0${SUB_CUSTOM}\" %1 %2 %3 \n)")
+  else()
+    set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
+  endif()
+
+   # change custom.bat/sh
   if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
     file (READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
 
@@ -275,68 +392,49 @@ else()
     OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}")
   endif()
 
+
   # write current custom.bat/sh
   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.in" "${SUB_CUSTOM}" "${INSTALL_DIR}")
 
   if (BUILD_MFC_SAMPLES)
     OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
+    OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
   endif()
 
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}" "${INSTALL_DIR}")
+  OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
+  OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.install.${SCRIPT_EXT}")
+  install(FILES "${CMAKE_BINARY_DIR}/env.install.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" RENAME "env.${SCRIPT_EXT}")
 endif()
 
 # RESOURCES
-OCCT_INSTALL_FILE_OR_DIR ("src/DrawResources"          "${INSTALL_DIR}/src")
+FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
-OCCT_INSTALL_FILE_OR_DIR ("src/StdResource"            "${INSTALL_DIR}/src")
+foreach(RESOURCE ${RESOURCES})
-OCCT_INSTALL_FILE_OR_DIR ("src/SHMessage"              "${INSTALL_DIR}/src")
+  get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
-OCCT_INSTALL_FILE_OR_DIR ("src/Textures"               "${INSTALL_DIR}/src")
+  if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
-OCCT_INSTALL_FILE_OR_DIR ("src/Shaders"                "${INSTALL_DIR}/src")
+    get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
-OCCT_INSTALL_FILE_OR_DIR ("src/XSMessage"              "${INSTALL_DIR}/src")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src/${RESOURCE_FOLDER}")
-OCCT_INSTALL_FILE_OR_DIR ("src/XSTEPResource"          "${INSTALL_DIR}/src")
+  else()
-OCCT_INSTALL_FILE_OR_DIR ("src/XmlOcafResource"        "${INSTALL_DIR}/src")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/src")
-
+  endif()
-OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Lexi_Expr.dat" "${INSTALL_DIR}/src/UnitsAPI")
+endforeach()
-OCCT_INSTALL_FILE_OR_DIR ("src/UnitsAPI/Units.dat"     "${INSTALL_DIR}/src/UnitsAPI")
-OCCT_INSTALL_FILE_OR_DIR ("src/TObj/TObj.msg"          "${INSTALL_DIR}/src/TObj")
-
-
-#Toolkits uses variables: INSTALL_DIR, OS_WITH_BIT, COMPILER, BUILD_POSTFIX
-OCCT_MAKE_OS_WITH_BITNESS()
-
-# consider for patch existence
-set (IS_PATCH_CURRENT "NO")
-set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
-if (NOT "${BUILD_PATCH_DIR}" STREQUAL "")
-  set (IS_PATCH_CURRENT "YES")
-  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
-endif()
 
 # include patched toolkit projects or original ones
-set (UNSUBDIRS "")
+foreach (USED_TOOLKIT ${USED_TOOLKITS})
-if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake")
+  if (NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/src/${USED_TOOLKIT}")
-  set (TK_ROOT_DIR ${BUILD_PATCH_DIR})
+    add_subdirectory(${BUILD_PATCH_DIR}/src/${USED_TOOLKIT})
-  include (${BUILD_PATCH_DIR}/adm/cmake/occt_inc_toolkits.cmake)
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT}")
-else()
+    add_subdirectory (${CMAKE_SOURCE_DIR}/src/${USED_TOOLKIT})
-  set (IS_PATCH_CURRENT "NO")
+  else()
-  set (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
+    message (STATUS "${USED_TOOLKIT} is not included")
-  include (adm/cmake/occt_inc_toolkits.cmake)
+  endif()
-endif()
+endforeach()
-
-# include some required original occt_inc_toolkits
-if (NOT "${UNSUBDIRS}" STREQUAL "")
-  set (IS_PATCH_CURRENT "NO")
-  # add required subdirs
-  foreach (UNSUBDIR ${UNSUBDIRS})
-    add_subdirectory (${CMAKE_SOURCE_DIR}/${UNSUBDIR})
-  endforeach()
-endif()
 
 # samples do not support patch usage
-IF (BUILD_MFC_SAMPLES)
+if (BUILD_MFC_SAMPLES)
-  SET (OCCT_ROOT ${CMAKE_SOURCE_DIR})
+  set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
 
-  SET (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
+  set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
-  SET (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
+  set (COMMON_WINMAIN_FILE      ${MFC_STANDARD_SAMPLES_DIR}/Common/Winmain.cpp)
 
   add_subdirectory(samples/mfc/standard/mfcsample)
   add_subdirectory(samples/mfc/standard/01_Geometry)
@@ -349,4 +447,8 @@ IF (BUILD_MFC_SAMPLES)
   add_subdirectory(samples/mfc/standard/08_HLR)
   add_subdirectory(samples/mfc/standard/09_Animation)
   add_subdirectory(samples/mfc/standard/10_Convert)
-ENDIF()
+endif()
+
+if (INSTALL_SAMPLES)
+  OCCT_INSTALL_FILE_OR_DIR ("samples" "${INSTALL_DIR}")
+endif()

adm/MODULES

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

adm/RESOURCES

@@ -0,0 +1,11 @@
+DrawResources
+StdResource
+SHMessage
+Textures
+Shaders
+XSMessage
+XSTEPResource
+XmlOcafResource
+UnitsAPI/Lexi_Expr.dat
+UnitsAPI/Units.dat
+TObj/TObj.msg

adm/cmake/3rdparty_macro.cmake

@@ -1,7 +1,7 @@
 #
 
 # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEBUG)
 
@@ -169,6 +169,8 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
     endif()
   endif()
 
+  set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
+
   if (INSTALL_${PRODUCT_NAME})
     OCCT_MAKE_OS_WITH_BITNESS()
     OCCT_MAKE_COMPILER_SHORT_NAME()
@@ -177,10 +179,16 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
     if (WIN32)
       install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
     else()
-      install (FILES "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+      get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} REALPATH)
+      if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
+        get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
+        install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME ${FREEIMLIB}.3)
+      endif()
+      if("${PRODUCT_NAME}" STREQUAL "GL2PS")
+        get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
+        install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME ${GL2PSLIB}.1)
+      endif()
     endif()
-
-    set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
   else()
     # the library directory for using by the executable
     if (WIN32)

adm/cmake/BuildToolkit.cmake

@@ -0,0 +1,96 @@
+# Get all used packages from toolkit
+foreach (MODULE ${TOOLKIT_MODULES})
+  if (WIN32)
+    list (APPEND PRECOMPILED_DEFS "-D__${MODULE}_DLL")
+  endif()
+  list (APPEND COMPILER_DIRECTORIES "${OCCT_SOURCE_DIR}/src/${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 (DEP ${${PROJECT_NAME}_DEPS})
+  IS_OCCT_TOOLKIT (${DEP} OCCT_MODULES FOUND_TOOLKIT)
+  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
+    list ( APPEND USED_LIBS "${DEP}" )
+  endif()
+endforeach()
+
+# Get all source files from used packages
+foreach (CDIR ${COMPILER_DIRECTORIES})
+  get_filename_component (CDirName ${CDIR} NAME)
+  set (CDIR_files)
+  file (STRINGS "${CDIR}/FILES" FLEX_Files REGEX ".+[.]lex")
+  file (STRINGS "${CDIR}/FILES" BISON_Files REGEX ".+[.]yacc")
+  file (STRINGS "${CDIR}/FILES" CFiles REGEX ".+[.]c")
+  file (STRINGS "${CDIR}/FILES" MFiles REGEX ".+[.]mm")
+
+  # Generate Flex and Bison files
+  if (${BUILD_BISON_FLEX_FILES})
+    list (LENGTH FLEX_Files FLength)
+    list (LENGTH BISON_Files BLength)
+    list (SORT FLEX_Files)
+    list (SORT BISON_Files)
+    if (${FLength} EQUAL ${BLength} AND NOT ${FLength} EQUAL 0)
+      math (EXPR FLength "${FLength} - 1")
+      foreach (FileIndex RANGE ${FLength})
+        list (GET FLEX_Files ${FileIndex} FLEX_File)
+        list (GET BISON_Files ${FileIndex} BISON_File)
+        get_filename_component (FLEX_Name ${FLEX_File} NAME_WE)
+        get_filename_component (BISON_Name ${BISON_File} NAME_WE)
+        string (COMPARE EQUAL ${FLEX_Name} ${BISON_Name} isEQUAL)
+        if (EXISTS "${FLEX_File}" AND EXISTS "${BISON_File}" AND ${isEQUAL})
+          BISON_TARGET (Parser_${BISON_Name} ${BISON_File} ${CDIR}/${BISON_Name}.tab.c)
+          FLEX_TARGET (Scanner_${FLEX_Name} ${FLEX_File} ${CDIR}/lex.${FLEX_Name}.c)
+          ADD_FLEX_BISON_DEPENDENCY (Scanner_${FLEX_Name} Parser_${BISON_Name})
+          list (APPEND CDIR_files ${BISON_Parser_${BISON_Name}_OUTPUTS} ${FLEX_Scanner_${FLEX_Name}_OUTPUTS})
+        endif()
+      endforeach()
+    endif()
+  endif()
+
+  list (APPEND CDIR_files ${CFiles})
+  if (APPLE)
+    list ( APPEND CDIR_files ${MFiles})
+  endif()
+
+  foreach (CFile ${CDIR_files})
+    list (APPEND USED_SRCFILES ${CDIR}/${CFile} )
+    SOURCE_GROUP (${CDirName} FILES ${CDIR}/${CFile})
+  endforeach()
+endforeach()
+
+list (APPEND COMPILER_DIRECTORIES "${OCCT_SOURCE_DIR}/src")
+list (FIND USED_TOOLKITS ${PROJECT_NAME} isFOUND)
+
+OCCT_MAKE_BUILD_POSTFIX()
+
+# Create project for toolkit
+if ("${USED_TOOLKITS}" STREQUAL "" OR NOT ${isFOUND} EQUAL -1)
+  foreach (MODULE ${OCCT_MODULES})
+    list (FIND ${MODULE}_TOOLKITS ${PROJECT_NAME} isFOUND)
+    if (NOT ${isFOUND} EQUAL -1)
+      set (CURRENT_MODULE ${MODULE})
+    endif()
+  endforeach()
+  if (isEXE)
+    add_executable (${PROJECT_NAME} ${USED_SRCFILES})
+    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+  else()
+    add_library (${PROJECT_NAME} ${USED_SRCFILES})
+    install (TARGETS ${PROJECT_NAME}
+             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    if (MSVC)
+      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}/${PROJECT_NAME}.pdb
+               CONFIGURATIONS Debug
+               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+    endif()
+  endif()
+
+  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
+  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+  include_directories (${COMPILER_DIRECTORIES})
+  target_link_libraries (${PROJECT_NAME} ${USED_LIBS})
+endif()

adm/cmake/freetype.cmake

@@ -12,7 +12,7 @@ endif()
 SET (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
 
 # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 OCCT_MAKE_COMPILER_SHORT_NAME()
 OCCT_MAKE_COMPILER_BITNESS()
@@ -59,9 +59,7 @@ if (WIN32)
   endif()
 endif()
 
-message (STATUS "Info: CMake default freetype search start...")
 find_package(Freetype)
-message (STATUS "Info: CMake default freetype search end")
 
 # ft2build header
 if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
@@ -73,7 +71,6 @@ endif()
 if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
   # cmake (version is < 3.0) doesn't find ftheader.h of freetype (version is >= 2.5.1)
   # do search taking into account freetype structure of 2.5.1 version
-  message (STATUS "Info: CMake default search doesn't found FREETYPE_INCLUDE_DIR_freetype2")
   find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES
                                              freetype/config/ftheader.h
                                              config/ftheader.h
@@ -87,12 +84,6 @@ if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_fre
                                            PATH_SUFFIXES include/freetype2 include freetype2
                                            NO_DEFAULT_PATH)
   find_path (FREETYPE_INCLUDE_DIR_freetype2 NAMES freetype/config/ftheader.h config/ftheader.h)
-  
-  if (NOT FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is NOT found by additional search")
-  else()
-    message (STATUS "Info: FREETYPE_INCLUDE_DIR_freetype2 is found by additional search")
-  endif()
 elseif (FREETYPE_INCLUDE_DIR_freetype2 OR EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
   if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
     get_filename_component (3RDPARTY_FREETYPE_DIR_ABS "${3RDPARTY_FREETYPE_DIR}" ABSOLUTE)
@@ -221,7 +212,9 @@ if (INSTALL_FREETYPE)
   if (WIN32)
     install (FILES "${3RDPARTY_FREETYPE_DLL}"     DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
   else()
-    install (FILES "${3RDPARTY_FREETYPE_LIBRARY}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    get_filename_component(ABS_PATH ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
+    get_filename_component(FREETYPELIB ${3RDPARTY_FREETYPE_LIBRARY} NAME)
+    install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME ${FREETYPELIB}.6)
   endif()
 
   set (USED_3RDPARTY_FREETYPE_DIR "")

adm/cmake/occt_defs_flags.cmake

@@ -40,7 +40,6 @@ if (IS_DEBUG_C)
   message (STATUS "-DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
   string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
-
 # enable parallel compilation on MSVC 9 and above
 if (MSVC AND NOT MSVC70 AND NOT MSVC80)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
@@ -49,7 +48,6 @@ endif()
 # generate a single response file which enlist all of the object files
 SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
 SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-
 # increase compiler warnings level (-W4 for MSVC, -Wall for GCC)
 if (MSVC)
   if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
@@ -61,6 +59,10 @@ elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
 
+if (DEFINED CMAKE_COMPILER_IS_GNUCXX OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+  set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+endif()
+
 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
 set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
 

adm/cmake/occt_macros.cmake

@@ -1,5 +1,4 @@
 #
-
 macro (OCCT_CHECK_AND_UNSET VARNAME)
   if (DEFINED ${VARNAME})
     unset (${VARNAME} CACHE)
@@ -14,8 +13,10 @@ macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
   OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY")
   OCCT_CHECK_AND_UNSET ("${VARNAME}_LIBRARY_DIR")
 
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+  if (WIN32)
-  OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL")
+    OCCT_CHECK_AND_UNSET ("${VARNAME}_DLL_DIR")
+  endif()
 endmacro()
 
 # BUILD_POSTFIX, IS_BUILD_DEBUG variables
@@ -157,6 +158,24 @@ macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE FINAL_NAME DESTINATION_P
   install(FILES "${OCCT_BINARY_DIR}/${FINAL_NAME}" DESTINATION  "${DESTINATION_PATH}")
 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 (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_COPIED_OBJECT}")
+    # secondly, rewrite original files with patched ones
+    file (COPY "${BUILD_PATCH_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  endif()
+endmacro()
+
+macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}")
+    configure_file("${BUILD_PATCH_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  else()
+    configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY)
+  endif()
+endmacro()
+
 function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
   set (${USE_PRODUCT} OFF PARENT_SCOPE)
 
@@ -180,22 +199,97 @@ function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
   endif()
 endfunction()
 
+function (FILE_TO_LIST FILE_NAME FILE_CONTENT)
+  set (LOCAL_FILE_CONTENT)
+  if (BUILD_PATCH_DIR AND EXISTS "${BUILD_PATCH_DIR}/${FILE_NAME}")
+    file (STRINGS "${BUILD_PATCH_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT)
+  endif()
 
+  set (${FILE_CONTENT} ${LOCAL_FILE_CONTENT} PARENT_SCOPE)
+endfunction()
 
+# Function to determine if TOOLKIT is OCCT toolkit
+function (IS_OCCT_TOOLKIT TOOLKIT_NAME MODULES IS_TOOLKIT_FOUND)
+  set (${IS_TOOLKIT_FOUND} OFF PARENT_SCOPE)
+  foreach (MODULE ${${MODULES}})
+    set (TOOLKITS ${${MODULE}_TOOLKITS})
+    list (FIND TOOLKITS ${TOOLKIT_NAME} FOUND)
 
+    if (NOT ${FOUND} EQUAL -1)
+      set (${IS_TOOLKIT_FOUND} ON PARENT_SCOPE)
+    endif()
+  endforeach(MODULE)
+endfunction()
 
+# TOOLKIT_DEPS is defined with dependencies from file src/TOOLKIT_NAME/EXTERNLIB.
+# CSF_ variables are ignored
+function (OCCT_TOOLKIT_DEP TOOLKIT_NAME TOOLKIT_DEPS)
+  FILE_TO_LIST ("src/${TOOLKIT_NAME}/EXTERNLIB" FILE_CONTENT)
 
+  #list (APPEND LOCAL_TOOLKIT_DEPS ${TOOLKIT_NAME})
+  set (LOCAL_TOOLKIT_DEPS)
+  foreach (FILE_CONTENT_LINE ${FILE_CONTENT})
+    string (REGEX MATCH "^TK" TK_FOUND ${FILE_CONTENT_LINE})
+    if ("${FILE_CONTENT_LINE}" STREQUAL "DRAWEXE" OR NOT "${TK_FOUND}" STREQUAL "")
+      list (APPEND LOCAL_TOOLKIT_DEPS ${FILE_CONTENT_LINE})
+    endif()
+  endforeach()
 
+  set (${TOOLKIT_DEPS} ${LOCAL_TOOLKIT_DEPS} PARENT_SCOPE)
+endfunction()
 
+# TOOLKIT_FULL_DEPS is defined with complete dependencies (all levels)
+function (OCCT_TOOLKIT_FULL_DEP TOOLKIT_NAME TOOLKIT_FULL_DEPS)
+  # first level dependencies are stored in LOCAL_TOOLKIT_FULL_DEPS
+  OCCT_TOOLKIT_DEP (${TOOLKIT_NAME} LOCAL_TOOLKIT_FULL_DEPS)
 
+  list (LENGTH LOCAL_TOOLKIT_FULL_DEPS LIST_LENGTH)
+  set (LIST_INDEX 0)
+  while (LIST_INDEX LESS LIST_LENGTH)
+    list (GET LOCAL_TOOLKIT_FULL_DEPS ${LIST_INDEX} CURRENT_TOOLKIT)
+    OCCT_TOOLKIT_DEP (${CURRENT_TOOLKIT} CURRENT_TOOLKIT_DEPS)
 
+    # append toolkits are not contained
+    foreach (CURRENT_TOOLKIT_DEP ${CURRENT_TOOLKIT_DEPS})
+      set (CURRENT_TOOLKIT_DEP_FOUND OFF)
+      foreach (LOCAL_TOOLKIT_FULL_DEP ${LOCAL_TOOLKIT_FULL_DEPS})
+        if ("${CURRENT_TOOLKIT_DEP}" STREQUAL "${LOCAL_TOOLKIT_FULL_DEP}")
+          set (CURRENT_TOOLKIT_DEP_FOUND ON)
+          break()
+        endif()
+      endforeach()
+      if ("${CURRENT_TOOLKIT_DEP_FOUND}" STREQUAL "OFF")
+        list (APPEND LOCAL_TOOLKIT_FULL_DEPS ${CURRENT_TOOLKIT_DEP})
+      endif()
+    endforeach()
 
+    # increment the list index
+    MATH(EXPR LIST_INDEX "${LIST_INDEX}+1")
 
+    # calculate new length
+    list (LENGTH LOCAL_TOOLKIT_FULL_DEPS LIST_LENGTH)
+  endwhile()
 
+  set (${TOOLKIT_FULL_DEPS} ${LOCAL_TOOLKIT_FULL_DEPS} PARENT_SCOPE)
+endfunction()
 
+# Function to get list of modules and toolkits from file adm/MODULES.
+# Creates list <$MODULE_LIST> to store list of MODULES and
+# <NAME_OF_MODULE>_TOOLKITS foreach module to store its toolkits.
+function (OCCT_MODULES_AND_TOOLKITS MODULE_LIST)
+  FILE_TO_LIST ("adm/MODULES" FILE_CONTENT)
 
+  foreach (CONTENT_LINE ${FILE_CONTENT})
+    string (REPLACE " " ";" CONTENT_LINE ${CONTENT_LINE})
+    list (GET CONTENT_LINE 0 MODULE_NAME)
+    list (REMOVE_AT CONTENT_LINE 0)
+    list (APPEND ${MODULE_LIST} ${MODULE_NAME})
+    # (!) REMOVE THE LINE BELOW (implicit variables)
+    set (${MODULE_NAME}_TOOLKITS ${CONTENT_LINE} PARENT_SCOPE)
+  endforeach()
 
-
+  set (${MODULE_LIST} ${${MODULE_LIST}} PARENT_SCOPE)
-
+endfunction()
-
 

adm/cmake/tbb.cmake

@@ -56,12 +56,12 @@ if (WIN32)
 endif()
 
 # tbb malloc shared library directory
-if (NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
+if (WIN32 AND NOT DEFINED 3RDPARTY_TBBMALLOC_DLL_DIR)
   set (3RDPARTY_TBBMALLOC_DLL_DIR "" CACHE FILEPATH "The directory containing tbb malloc shared library")
 endif()
 
 # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
 # search for product directory inside 3RDPARTY_DIR directory
 if (NOT 3RDPARTY_TBB_DIR AND 3RDPARTY_DIR)
@@ -83,6 +83,7 @@ endif()
 # search for include directory in defined 3rdparty directory
 if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
   set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing the headers of tbb" FORCE)
+  find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include" NO_DEFAULT_PATH)
   find_path (3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
 endif()
 
@@ -103,6 +104,17 @@ OCCT_MAKE_BUILD_POSTFIX()
 
 # search for tbb and tbb malloc library in defined 3rdparty directory
 foreach (LIBRARY_NAME TBB TBBMALLOC)
+  if (NOT WIN32)
+    file (GLOB TBB_SUBDIRS RELATIVE ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/ ${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/*)
+    list (SORT TBB_SUBDIRS)
+    list (REVERSE TBB_SUBDIRS)
+    list (LENGTH TBB_SUBDIRS TBB_SUBDIRS_LENGTH)
+    set (TBB_SUBDIR_FIRST "")
+    if (${TBB_SUBDIRS_LENGTH})
+      list (GET TBB_SUBDIRS 0 TBB_SUBDIR_FIRST)
+      set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_SUBDIR_FIRST}")
+    endif()
+  endif()
   if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR)
     set (3RDPARTY_${LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${LIBRARY_NAME} library" FORCE)
   elseif (3RDPARTY_${LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}")
@@ -136,7 +148,8 @@ foreach (LIBRARY_NAME TBB TBBMALLOC)
         message (STATUS "Warning: debug version of ${LIBRARY_NAME} library isn't found (${LIBRARY_NAME}_debug) in ${3RDPARTY_TBB_DIR}/lib(d). Search for release one")
       endif()
 
-      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${LIBRARY_NAME}
+      string (TOLOWER "${LIBRARY_NAME}" lower_LIBRARY_NAME)
+      find_library (3RDPARTY_${LIBRARY_NAME}_LIBRARY ${lower_LIBRARY_NAME}
                                                      PATHS
                                                       "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}"
                                                       "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${TBB_COMPILER_FOLER}"
@@ -149,8 +162,8 @@ foreach (LIBRARY_NAME TBB TBBMALLOC)
 
   if (NOT 3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}")
     get_filename_component(3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY}" PATH)
-    set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
   endif()
+  set (3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${LIBRARY_NAME}_LIBRARY_DIR}" CACHE FILEPATH "The directory containing ${LIBRARY_NAME} library" FORCE)
 
   # search for dll in defined 3rdparty directory (just for win case)
   if (WIN32)
@@ -234,7 +247,10 @@ if (INSTALL_TBB)
   if (WIN32)
     install (FILES ${3RDPARTY_TBB_DLL} ${3RDPARTY_TBBMALLOC_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
   else()
-    install (FILES ${3RDPARTY_TBB_LIBRARY} ${3RDPARTY_TBBMALLOC_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+    get_filename_component(TBBLIB ${3RDPARTY_TBB_LIBRARY} NAME)
+    get_filename_component(TBBMALLOCLIB ${3RDPARTY_TBBMALLOC_LIBRARY} NAME)
+    install (FILES ${3RDPARTY_TBB_LIBRARY}.2 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME ${TBBLIB}.2)
+    install (FILES ${3RDPARTY_TBBMALLOC_LIBRARY}.2 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}" RENAME ${TBBMALLOCLIB}.2)
   endif()
 
   set (USED_3RDPARTY_TBB_DIR "")

adm/cmake/tcl.cmake

@@ -297,7 +297,7 @@ endforeach()
 # install tcltk
 if (INSTALL_TCL)
   # include occt macros. compiler_bitness, os_wiht_bit, compiler and build_postfix
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/occt_macros")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
 
   OCCT_MAKE_OS_WITH_BITNESS()
   OCCT_MAKE_COMPILER_SHORT_NAME()
@@ -305,8 +305,12 @@ if (INSTALL_TCL)
 
   if (WIN32)
     install (FILES ${3RDPARTY_TCL_DLL} ${3RDPARTY_TK_DLL} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
+	install (FILES ${3RDPARTY_TCL_DLL_DIR}/zlib1.dll DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
   else()
-    install (FILES ${3RDPARTY_TCL_LIBRARY} ${3RDPARTY_TK_LIBRARY} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+  	get_filename_component(ABS_PATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
+    install (FILES ${ABS_PATH} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
+	get_filename_component(ABS_PATH ${3RDPARTY_TK_LIBRARY} REALPATH)
+	install (FILES ${ABS_PATH} DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_POSTFIX}")
   endif()
 
   if (TCL_TCLSH_VERSION)

adm/templates/custom.bat.in

@@ -10,6 +10,7 @@ if "%VCVER%" == "@COMPILER@" (
       set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIR@"
       set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
       set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
+      set "CSF_TestDataPath=@TESTS_SHAPES_DIR@"
     )
   ) 
 )

adm/templates/custom.sh.in

@@ -9,6 +9,7 @@ if [ "$COMPILER" == "@COMPILER@" ]; then
       export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIR@"
       export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
       export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
+      export CSF_TestDataPath="@TESTS_SHAPES_DIR@"
     fi
   fi
 fi

adm/templates/draw.bat

@@ -1,10 +1,10 @@
 @echo off
 
 rem Setup environment and launch DRAWEXE
-call "%~dp0env.bat" %1 %2 %3
+call "%~dp0env.bat"
 
 echo Hint: use "pload ALL" command to load standard commands
-"%CASROOT%/%BIN_TAIL%/DRAWEXE.exe"
+DRAWEXE.exe %*
 
 set "PATH=%ORIGIN_PATH%"
 

adm/templates/env.build.bat.in

@@ -0,0 +1,73 @@
+echo off
+
+set "SCRIPTROOT=%~dp0"
+set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
+
+set "CASROOT=@CMAKE_SOURCE_DIR@"
+
+set "VCVER=@COMPILER@"
+set "ARCH=@COMPILER_BITNESS@"
+set "CASDEB=@BUILD_POSTFIX@"
+
+if not ["%1"]    == [""]      set "VCVER=%1"
+if not ["%2"]    == [""]      set "ARCH=%2"
+if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
+if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
+if /I ["%3"]     == ["debug"] set "CASDEB=d"
+if /I ["%3"]     == ["d"]     set "CASDEB=d"
+
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3
+)
+
+if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
+
+set "ORIGIN_PATH=%PATH%"
+
+if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
+if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
+if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
+if not ["%FREEIMAGEPLUS_DIR%"] == [""] set "PATH=%FREEIMAGEPLUS_DIR%;%PATH%"
+if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
+if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
+if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
+
+rem ----- Set path to 3rd party and OCCT libraries -----
+set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
+set "PATH=@CMAKE_BINARY_DIR@/%BIN_TAIL%;%PATH%"
+
+rem ----- Set envoronment variables used by OCCT -----
+set  CSF_LANGUAGE=us
+set  MMGT_CLEAR=1
+set  CSF_EXCEPTION_PROMPT=1
+set "CSF_SHMessage=%CASROOT%\src\SHMessage"
+set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
+set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
+set "CSF_XSMessage=%CASROOT%\src\XSMessage"
+set "CSF_TObjMessage=%CASROOT%\src\TObj"
+set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
+set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
+set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
+set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
+set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
+set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
+set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
+set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
+set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
+set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
+
+rem Draw Harness special stuff
+if exist "%CASROOT%\src\DrawResources" (
+  set "DRAWHOME=%CASROOT%\src\DrawResources"
+  set "CSF_DrawPluginDefaults=%CASROOT%\src\DrawResources"
+
+  if exist "%CASROOT%\src\DrawResources\DrawDefault" (
+    set "DRAWDEFAULT=%CASROOT%\src\DrawResources\DrawDefault"
+  )
+)
+
+if exist "%CASROOT%\src\DrawResourcesProducts" (
+  set "CSF_DrawPluginProductsDefaults=%CASROOT%\src\DrawResourcesProducts"
+)
+

adm/templates/env.build.sh.in

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+
+export CASROOT="@CMAKE_SOURCE_DIR@"
+
+if [ "${CASROOT}" == "" ]; then
+  export CASROOT="${aScriptPath}"
+fi
+
+# Read script arguments
+shopt -s nocasematch
+export CASDEB="@BUILD_POSTFIX@";
+if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
+shopt -u nocasematch
+
+export COMPILER="@COMPILER@"
+
+# ----- Set path to 3rd party and OCCT libraries -----
+anArch=`uname -m`
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+  export ARCH="32";
+else
+  export ARCH="64";
+fi
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  export WOKSTATION="mac";
+  export ARCH="64";
+else
+  export WOKSTATION="lin";
+fi
+
+# ----- Set local settings -----
+if [ -e "${aScriptPath}/custom.sh" ]; then
+  source "${aScriptPath}/custom.sh" "${COMPILER}" "${WOKSTATION}${ARCH}" "${CASDEB}"
+fi
+
+THRDPARTY_PATH=""
+if [ "$TCL_DIR" != "" ]; then
+  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$FREETYPE_DIR" != "" ]; then
+  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$FREEIMAGE_DIR" != "" ]; then
+  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$GL2PS_DIR" != "" ]; then
+  THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$TBB_DIR" != "" ]; then
+  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
+fi
+
+if [ "$VTK_DIR" != "" ]; then
+  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
+fi
+
+BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
+LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
+
+export PATH="@CMAKE_BINARY_DIR@/${BIN_PATH}:${PATH}"
+
+if [ "$LD_LIBRARY_PATH" != "" ]; then
+  export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
+else
+  export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}"
+fi
+
+if [ "$WOKSTATION" == "mac" ]; then
+  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
+  else
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
+  fi
+fi
+
+# ----- Set envoronment variables used by OCCT -----
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+export CSF_SHMessage="${CASROOT}/src/SHMessage"
+export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
+export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
+export CSF_XSMessage="${CASROOT}/src/XSMessage"
+export CSF_TObjMessage="${CASROOT}/src/TObj"
+export CSF_StandardDefaults="${CASROOT}/src/StdResource"
+export CSF_PluginDefaults="${CASROOT}/src/StdResource"
+export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
+export CSF_TObjDefaults="${CASROOT}/src/StdResource"
+export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
+export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
+export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
+export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
+export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
+export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
+
+# Draw Harness special stuff
+if [ -e "${CASROOT}/src/DrawResources" ]; then
+  export DRAWHOME="${CASROOT}/src/DrawResources"
+  export CSF_DrawPluginDefaults="${CASROOT}/src/DrawResources"
+
+  if [ -e "${CASROOT}/src/DrawResources/DrawDefault" ]; then
+    export DRAWDEFAULT="${CASROOT}/src/DrawResources/DrawDefault"
+  fi
+fi
+
+if [ -e "${CASROOT}/src/DrawResourcesProducts" ]; then
+  export CSF_DrawPluginProductsDefaults="${CASROOT}/src/DrawResourcesProducts"
+fi
+

samples/mfc/standard/01_Geometry/CMakeLists.txt

@@ -73,7 +73,7 @@ install (TARGETS Geometry RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITN
                           ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                           LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${Geometry_SRC_DIR}
                      ${Geometry_ISESSION2D_DIR}
                      ${Geometry_RESOURCE_DIR}

samples/mfc/standard/02_Modeling/CMakeLists.txt

@@ -43,7 +43,7 @@ install (TARGETS Modeling RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITN
                           ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                           LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_SAMPLES_DIR}/02_Modeling
                      ${Modeling_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/03_Viewer2d/CMakeLists.txt

@@ -39,7 +39,7 @@ install (TARGETS Viewer2d RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITN
                           ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                           LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_SAMPLES_DIR}/03_Viewer2d
                      ${Viewer2d_SOURCE_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/04_Viewer3d/CMakeLists.txt

@@ -67,7 +67,7 @@ install (TARGETS Viewer3d RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITN
                           ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                           LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${Viewer3d_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 

samples/mfc/standard/05_ImportExport/CMakeLists.txt

@@ -43,7 +43,7 @@ install (TARGETS ImportExport RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_
                               ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                               LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport
                      ${ImportExport_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/06_Ocaf/CMakeLists.txt

@@ -59,7 +59,7 @@ install (TARGETS Ocaf RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}
                       ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                       LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_SAMPLES_DIR}/06_Ocaf
                      ${Ocaf_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/07_Triangulation/CMakeLists.txt

@@ -45,7 +45,7 @@ install (TARGETS Triangulation RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER
                                ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                                LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_SAMPLES_DIR}/07_Triangulation
                      ${Triangulation_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/08_HLR/CMakeLists.txt

@@ -67,7 +67,7 @@ install (TARGETS HLR RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/
                      ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                      LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${HLR_RESOURCE_DIR}
                      ${HLR_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/09_Animation/CMakeLists.txt

@@ -50,7 +50,7 @@ install (TARGETS Animation RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BIT
                            ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                            LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${Animation_RESOURCE_DIR}
                      ${Animation_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)

samples/mfc/standard/10_Convert/CMakeLists.txt

@@ -67,7 +67,7 @@ install (TARGETS Convert RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNE
                          ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                          LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories (${OCCT_ROOT}/inc
+include_directories (${CMAKE_SOURCE_DIR}/src
                      ${Convert_SRC_DIR}
                      ${ISESSION_SUBDIR}
                      ${WNT_SUBDIR}

samples/mfc/standard/mfcsample/CMakeLists.txt

@@ -142,7 +142,7 @@ install (TARGETS mfcsample RUNTIME DESTINATION "${INSTALL_DIR}/win${COMPILER_BIT
                            ARCHIVE DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}"
                            LIBRARY DESTINATION "${INSTALL_DIR}/win${COMPILER_BITNESS}/${COMPILER}/lib${BUILD_POSTFIX}")
 
-include_directories( ${OCCT_ROOT}/inc
+include_directories( ${CMAKE_SOURCE_DIR}/src
                      ${MFC_STANDARD_COMMON_SAMPLES_DIR}
                      ${COMMON_IE_DIR}
                      ${COMMON_ISESSION2D_DIR}
@@ -157,9 +157,7 @@ set (mfcsample_USED_LIBS  TKVRML
                           TKShHealing
                           TKSTEP
                           TKXSBase
-                          TKShapeSchema
                           FWOSPlugin
-                          PTKernel
                           TKBool
                           TKCAF
                           TKCDF
@@ -174,9 +172,7 @@ set (mfcsample_USED_LIBS  TKVRML
                           TKMath
                           TKOffset
                           TKOpenGl
-                          TKPCAF
                           TKPrim
-                          TKPShape
                           TKService
                           TKTopAlgo
                           TKMesh

src/Aspect/EXTERNLIB

@@ -1 +0,0 @@
-CSF_XwLibs

src/Aspect/FILES

@@ -71,4 +71,3 @@ Aspect_WindowDefinitionError.hxx
 Aspect_WindowError.hxx
 Aspect_XAtom.hxx
 Aspect_XWD.hxx
-EXTERNLIB

src/BRepMesh/EXTERNLIB

@@ -1 +0,0 @@
-CSF_TBB

src/BRepMesh/FILES

@@ -53,4 +53,3 @@ BRepMesh_WireChecker.cxx
 BRepMesh_WireChecker.hxx
 BRepMesh_WireInterferenceChecker.cxx
 BRepMesh_WireInterferenceChecker.hxx
-EXTERNLIB

src/CDF/FILES

@@ -26,4 +26,3 @@ CDF_Timer.cxx
 CDF_Timer.hxx
 CDF_TryStoreStatus.hxx
 CDF_TypeOfActivation.hxx
-EXTERNLIB

src/Cocoa/EXTERNLIB

@@ -1,3 +0,0 @@
-CSF_objc
-CSF_Appkit
-CSF_IOKit

src/Cocoa/FILES

@@ -2,4 +2,3 @@ Cocoa_LocalPool.hxx
 Cocoa_LocalPool.mm
 Cocoa_Window.hxx
 Cocoa_Window.mm
-EXTERNLIB

src/DDataStd/EXTERNLIB

@@ -1 +0,0 @@
-TKDraw

src/DDataStd/FILES

@@ -15,4 +15,3 @@ DDataStd_TreeBrowser.cxx
 DDataStd_TreeBrowser.hxx
 DDataStd_TreeBrowser.tcl
 DDataStd_TreeCommands.cxx
-EXTERNLIB

src/DRAWEXE/CMakeLists.txt

@@ -0,0 +1,9 @@
+project(DRAWEXE)
+
+set (isEXE TRUE)
+
+set (TOOLKIT_MODULES
+  DRAWEXE
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/Draw/EXTERNLIB

@@ -1,9 +0,0 @@
-CSF_TclLibs
-CSF_TclTkLibs
-CSF_gdi32
-CSF_advapi32
-CSF_user32
-CSF_TBB
-CSF_objc
-CSF_Appkit
-CSF_IOKit

src/Draw/FILES

@@ -72,7 +72,6 @@ Draw_Window.cxx
 Draw_Window.hxx
 Draw_Window_1.mm
 DrawRessource.h
-EXTERNLIB
 init.cxx
 init.h
 MainWindow.cxx

src/FWOSPlugin/CMakeLists.txt

@@ -0,0 +1,7 @@
+project(FWOSPlugin)
+
+set (TOOLKIT_MODULES
+  FWOSDriver
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/Font/EXTERNLIB

@@ -1 +0,0 @@
-CSF_FREETYPE

src/Font/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 Font_BRepFont.cxx
 Font_BRepFont.hxx
 Font_FontAspect.hxx

src/GeomToStep/GeomToStep_MakeAxis1Placement.cxx

@@ -33,7 +33,7 @@
 //=============================================================================
 GeomToStep_MakeAxis1Placement::GeomToStep_MakeAxis1Placement( const gp_Ax1& A)
 {
-#include <GeomToStep_MakeAxis1Placement_gen.pxx>
+#include "GeomToStep_MakeAxis1Placement_gen.pxx"
 }
 //=============================================================================
 // Creation d' un axis1_placement de prostep a partir d' un Ax2d de gp
@@ -41,7 +41,7 @@ GeomToStep_MakeAxis1Placement::GeomToStep_MakeAxis1Placement( const gp_Ax1& A)
 
 GeomToStep_MakeAxis1Placement::GeomToStep_MakeAxis1Placement( const gp_Ax2d& A)
 {
-#include <GeomToStep_MakeAxis1Placement_gen.pxx>
+#include "GeomToStep_MakeAxis1Placement_gen.pxx"
 }
 
 //=============================================================================
@@ -54,7 +54,7 @@ GeomToStep_MakeAxis1Placement::GeomToStep_MakeAxis1Placement
 {
   gp_Ax1 A;
   A = Axis1->Ax1();
-#include<GeomToStep_MakeAxis1Placement_gen.pxx>
+#include "GeomToStep_MakeAxis1Placement_gen.pxx"
 }
 
 //=============================================================================
@@ -67,7 +67,7 @@ GeomToStep_MakeAxis1Placement::GeomToStep_MakeAxis1Placement
 {
   gp_Ax2d A;
   A = Axis1->Ax2d();
-#include<GeomToStep_MakeAxis1Placement_gen.pxx>
+#include "GeomToStep_MakeAxis1Placement_gen.pxx"
 }
 
 //=============================================================================

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnots.cxx

@@ -41,7 +41,7 @@ GeomToStep_MakeBSplineCurveWithKnots::
 								      
 {
 #define Array1OfPnt_gen TColgp_Array1OfPnt
-#include <GeomToStep_MakeBSplineCurveWithKnots_gen.pxx>
+#include "GeomToStep_MakeBSplineCurveWithKnots_gen.pxx"
 #undef Array1OfPnt_gen
 }
 //=============================================================================
@@ -55,7 +55,7 @@ GeomToStep_MakeBSplineCurveWithKnots::
 								      
 {
 #define Array1OfPnt_gen TColgp_Array1OfPnt2d
-#include <GeomToStep_MakeBSplineCurveWithKnots_gen.pxx>
+#include "GeomToStep_MakeBSplineCurveWithKnots_gen.pxx"
 #undef Array1OfPnt_gen
 }
 

src/GeomToStep/GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve.cxx

@@ -41,7 +41,7 @@ GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve::
 								      
 {
 #define Array1OfPnt_gen TColgp_Array1OfPnt
-#include <GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve_gen.pxx>
+#include "GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve_gen.pxx"
 #undef Array1OfPnt_gen
 }
 //=============================================================================
@@ -55,7 +55,7 @@ GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve::
 								      
 {
 #define Array1OfPnt_gen TColgp_Array1OfPnt2d
-#include <GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve_gen.pxx>
+#include "GeomToStep_MakeBSplineCurveWithKnotsAndRationalBSplineCurve_gen.pxx"
 #undef Array1OfPnt_gen
 }
 

src/GeomToStep/GeomToStep_MakeCircle.cxx

@@ -34,7 +34,7 @@
 //=============================================================================
 GeomToStep_MakeCircle::GeomToStep_MakeCircle( const gp_Circ& C)
 {
-#include <GeomToStep_MakeCircle_gen.pxx>
+#include "GeomToStep_MakeCircle_gen.pxx"
 }
 
 
@@ -47,7 +47,7 @@ GeomToStep_MakeCircle::GeomToStep_MakeCircle( const Handle(Geom_Circle)& Cer)
 {
   gp_Circ C;
   C = Cer->Circ();
-#include <GeomToStep_MakeCircle_gen.pxx>
+#include "GeomToStep_MakeCircle_gen.pxx"
 }
 
 

src/GeomToStep/GeomToStep_MakeEllipse.cxx

@@ -34,7 +34,7 @@
 //=============================================================================
 GeomToStep_MakeEllipse::GeomToStep_MakeEllipse( const gp_Elips& E)
 {
-#include <GeomToStep_MakeEllipse_gen.pxx>
+#include "GeomToStep_MakeEllipse_gen.pxx"
 }
 
 
@@ -47,7 +47,7 @@ GeomToStep_MakeEllipse::GeomToStep_MakeEllipse( const Handle(Geom_Ellipse)& Cer)
 {
   gp_Elips E;
   E = Cer->Elips();
-#include <GeomToStep_MakeEllipse_gen.pxx>
+#include "GeomToStep_MakeEllipse_gen.pxx"
 }
 
 

src/GeomToStep/GeomToStep_MakeLine.cxx

@@ -36,7 +36,7 @@
 GeomToStep_MakeLine::GeomToStep_MakeLine( const gp_Lin& L)
 {
 #define Vec_gen gp_Vec
-#include <GeomToStep_MakeLine_gen.pxx>
+#include "GeomToStep_MakeLine_gen.pxx"
 #undef Vec_gen
 }
 
@@ -47,7 +47,7 @@ GeomToStep_MakeLine::GeomToStep_MakeLine( const gp_Lin& L)
 GeomToStep_MakeLine::GeomToStep_MakeLine( const gp_Lin2d& L)
 {
 #define Vec_gen gp_Vec2d
-#include <GeomToStep_MakeLine_gen.pxx>
+#include "GeomToStep_MakeLine_gen.pxx"
 #undef Vec_gen
 }
 
@@ -60,7 +60,7 @@ GeomToStep_MakeLine::GeomToStep_MakeLine ( const Handle(Geom_Line)& Gline)
   gp_Lin L;
   L = Gline->Lin();
 #define Vec_gen gp_Vec
-#include <GeomToStep_MakeLine_gen.pxx>
+#include "GeomToStep_MakeLine_gen.pxx"
 #undef Vec_gen
 }
 
@@ -73,7 +73,7 @@ GeomToStep_MakeLine::GeomToStep_MakeLine ( const Handle(Geom2d_Line)& Gline)
   gp_Lin2d L;
   L = Gline->Lin2d();
 #define Vec_gen gp_Vec2d
-#include <GeomToStep_MakeLine_gen.pxx>
+#include "GeomToStep_MakeLine_gen.pxx"
 #undef Vec_gen
 }
 

src/GeomToStep/GeomToStep_MakePolyline.cxx

@@ -32,7 +32,7 @@
 GeomToStep_MakePolyline::GeomToStep_MakePolyline( const TColgp_Array1OfPnt& P)
 {
   gp_Pnt P1;
-#include <GeomToStep_MakePolyline_gen.pxx>
+#include "GeomToStep_MakePolyline_gen.pxx"
 }
 
 //=============================================================================
@@ -42,7 +42,7 @@ GeomToStep_MakePolyline::GeomToStep_MakePolyline( const TColgp_Array1OfPnt& P)
 GeomToStep_MakePolyline::GeomToStep_MakePolyline( const TColgp_Array1OfPnt2d& P)
 {
   gp_Pnt2d P1;
-#include <GeomToStep_MakePolyline_gen.pxx>
+#include "GeomToStep_MakePolyline_gen.pxx"
 }
 //=============================================================================
 // renvoi des valeurs

src/GeomToStep/GeomToStep_MakeVector.cxx

@@ -35,7 +35,7 @@ GeomToStep_MakeVector::GeomToStep_MakeVector( const gp_Vec& V)
 {
   gp_Dir D = gp_Dir(V);
   Standard_Real lFactor = UnitsMethods::LengthFactor();
-#include <GeomToStep_MakeVector_gen.pxx>
+#include "GeomToStep_MakeVector_gen.pxx"
 }
 //=============================================================================
 // Creation d' un vector de prostep a partir d' un Vec2d de gp
@@ -45,7 +45,7 @@ GeomToStep_MakeVector::GeomToStep_MakeVector( const gp_Vec2d& V)
 {
   gp_Dir2d D = gp_Dir2d(V);
   Standard_Real lFactor = 1.;
-#include <GeomToStep_MakeVector_gen.pxx>
+#include "GeomToStep_MakeVector_gen.pxx"
 }
 
 //=============================================================================
@@ -59,7 +59,7 @@ GeomToStep_MakeVector::GeomToStep_MakeVector ( const Handle(Geom_Vector)&
   V = GVector->Vec();
   gp_Dir D = gp_Dir(V);
   Standard_Real lFactor = UnitsMethods::LengthFactor();
-#include <GeomToStep_MakeVector_gen.pxx>
+#include "GeomToStep_MakeVector_gen.pxx"
 }
 
 //=============================================================================
@@ -73,7 +73,7 @@ GeomToStep_MakeVector::GeomToStep_MakeVector ( const Handle(Geom2d_Vector)&
   V = GVector->Vec2d();
   gp_Dir2d D = gp_Dir2d(V);
   Standard_Real lFactor = 1.;
-#include <GeomToStep_MakeVector_gen.pxx>
+#include "GeomToStep_MakeVector_gen.pxx"
 }
 
 //=============================================================================

src/Graphic3d/Graphic3d_CStructure.cxx

@@ -14,7 +14,7 @@
 
 #include <Graphic3d_CStructure.hxx>
 
-#include <Graphic3d_Structure.pxx>
+#include "Graphic3d_Structure.pxx"
 #include <Graphic3d_StructureManager.hxx>
 #include <Graphic3d_TransModeFlags.hxx>
 

src/Graphic3d/Graphic3d_Group.cxx

@@ -27,7 +27,7 @@
 #include <Graphic3d_GroupDefinitionError.hxx>
 #include <Graphic3d_ShaderProgram.hxx>
 #include <Graphic3d_Structure.hxx>
-#include <Graphic3d_Structure.pxx>
+#include "Graphic3d_Structure.pxx"
 #include <Graphic3d_StructureManager.hxx>
 #include <Graphic3d_TextureMap.hxx>
 #include <Graphic3d_TransModeFlags.hxx>

src/Graphic3d/Graphic3d_Structure.cxx

@@ -29,7 +29,7 @@
 #include <Graphic3d_MaterialAspect.hxx>
 #include <Graphic3d_PriorityDefinitionError.hxx>
 #include <Graphic3d_Structure.hxx>
-#include <Graphic3d_Structure.pxx>
+#include "Graphic3d_Structure.pxx"
 #include <Graphic3d_StructureDefinitionError.hxx>
 #include <Graphic3d_StructureManager.hxx>
 #include <Graphic3d_TextureMap.hxx>

src/Graphic3d/Graphic3d_Structure.pxx

@@ -20,7 +20,7 @@
 #define Structure_MAX_PRIORITY 10
 #define Structure_MIN_PRIORITY 0
 
-#include <Graphic3d_StructureManager.pxx>
+#include "Graphic3d_StructureManager.pxx"
 
 // structures identifiers : possible range
 	// check the value of View_IDMAX (must be < Structure_IDMIN)

src/Graphic3d/Graphic3d_StructureManager.cxx

@@ -30,7 +30,7 @@
 #include <Graphic3d_InitialisationError.hxx>
 #include <Graphic3d_Structure.hxx>
 #include <Graphic3d_StructureManager.hxx>
-#include <Graphic3d_StructureManager.pxx>
+#include "Graphic3d_StructureManager.pxx"
 #include <Standard_Transient.hxx>
 #include <Standard_Type.hxx>
 
@@ -38,7 +38,7 @@ static Standard_Boolean Initialisation = Standard_True;
 static int StructureManager_ArrayId[StructureManager_MAX];
 static Standard_Integer StructureManager_CurrentId = 0;
 
-#include <Graphic3d_Structure.pxx>
+#include "Graphic3d_Structure.pxx"
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 
 Graphic3d_StructureManager::Graphic3d_StructureManager (const Handle(Graphic3d_GraphicDriver)& theDriver)

src/IVtkDraw/EXTERNLIB

@@ -1 +0,0 @@
-CSF_VTK

src/IVtkDraw/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 IVtkDraw.cxx
 IVtkDraw.hxx
 IVtkDraw_HighlightAndSelectionPipeline.cxx

src/IVtkTools/EXTERNLIB

@@ -1 +0,0 @@
-CSF_VTK

src/IVtkTools/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 IVtkTools.cxx
 IVtkTools.hxx
 IVtkTools_DisplayModeFilter.cxx

src/IVtkVTK/EXTERNLIB

@@ -1 +0,0 @@
-CSF_VTK

src/IVtkVTK/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 IVtkVTK_ShapeData.cxx
 IVtkVTK_ShapeData.hxx
 IVtkVTK_View.cxx

src/Image/EXTERNLIB

@@ -1 +0,0 @@
-CSF_FreeImagePlus

src/Image/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 Image_AlienPixMap.cxx
 Image_AlienPixMap.hxx
 Image_Color.hxx

src/OSD/EXTERNLIB

@@ -1 +0,0 @@
-CSF_TBB

src/OSD/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 OSD.cxx
 OSD.hxx
 OSD_Chronometer.cxx

src/OpenGl/EXTERNLIB

@@ -1,11 +0,0 @@
-CSF_user32
-CSF_gdi32
-CSF_opengl32
-CSF_glu32
-CSF_objc
-CSF_Appkit
-CSF_IOKit
-CSF_OpenGlLibs
-CSF_AviLibs
-CSF_FREETYPE
-CSF_GL2PS

src/OpenGl/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 glext.h
 OpenGl_ArbDbg.hxx
 OpenGl_ArbFBO.hxx

src/QABugs/EXTERNLIB

@@ -1 +0,0 @@
-CSF_TBB

src/QABugs/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 QABugs.cxx
 QABugs.hxx
 QABugs_1.cxx

src/QADraw/EXTERNLIB

@@ -1,6 +0,0 @@
-CSF_TclLibs
-CSF_TclTkLibs
-CSF_gdi32
-CSF_advapi32
-CSF_user32
-

src/QADraw/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 QADraw.cxx
 QADraw.hxx
 QADraw_Additional.cxx

src/STEPConstruct/EXTERNLIB

@@ -1 +0,0 @@
-CSF_wsock32

src/STEPConstruct/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 STEPConstruct.cxx
 STEPConstruct.hxx
 STEPConstruct_AP203Context.cxx

src/Standard/EXTERNLIB

@@ -1,4 +0,0 @@
-CSF_SOCKETLibs
-CSF_ThreadLibs
-CSF_kernel32
-CSF_TBB

src/Standard/FILES

@@ -1,4 +1,3 @@
-EXTERNLIB
 Standard.cxx
 Standard.hxx
 Standard_AbortiveTransaction.hxx

src/TKBO/CMakeLists.txt

@@ -0,0 +1,12 @@
+project(TKBO)
+
+set (TOOLKIT_MODULES
+  IntTools
+  BRepAlgoAPI
+  BOPCol
+  BOPDS
+  BOPAlgo
+  BOPTools
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBRep/CMakeLists.txt

@@ -0,0 +1,14 @@
+project(TKBRep)
+
+set (TOOLKIT_MODULES
+  TopoDS
+  TopExp
+  TopTools
+  BRep
+  BRepLProp
+  BRepAdaptor
+  BRepTools
+  BinTools
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBin/CMakeLists.txt

@@ -0,0 +1,10 @@
+project(TKBin)
+
+set (TOOLKIT_MODULES
+  BinDrivers
+  BinMDataXtd
+  BinMPrsStd
+  BinMNaming
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBinL/CMakeLists.txt

@@ -0,0 +1,12 @@
+project(TKBinL)
+
+set (TOOLKIT_MODULES
+  BinMDF
+  BinMDataStd
+  BinMFunction
+  BinMDocStd
+  BinObjMgt
+  BinLDrivers
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBinTObj/CMakeLists.txt

@@ -0,0 +1,7 @@
+project(TKBinTObj)
+
+set (TOOLKIT_MODULES
+  BinTObjDrivers
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBinXCAF/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(TKBinXCAF)
+
+set (TOOLKIT_MODULES
+  BinXCAFDrivers
+  BinMXCAFDoc
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKBool/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(TKBool)
+
+set (TOOLKIT_MODULES
+  TopOpeBRep
+  TopOpeBRepDS
+  TopOpeBRepBuild
+  TopOpeBRepTool
+  BRepAlgo
+  BRepFill
+  BRepProj
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKCAF/CMakeLists.txt

@@ -0,0 +1,10 @@
+project(TKCAF)
+
+set (TOOLKIT_MODULES
+  TDataXtd
+  TNaming
+  TPrsStd
+  AppStd
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKCDF/CMakeLists.txt

@@ -0,0 +1,11 @@
+project(TKCDF)
+
+set (TOOLKIT_MODULES
+  CDM
+  PCDM
+  CDF
+  UTL
+  LDOM
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKDCAF/CMakeLists.txt

@@ -0,0 +1,12 @@
+project(TKDCAF)
+
+set (TOOLKIT_MODULES
+  DDF
+  DDocStd
+  DNaming
+  DDataStd
+  DPrsStd
+  DrawDim
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKDraw/CMakeLists.txt

@@ -0,0 +1,37 @@
+project(TKDraw)
+
+set (TOOLKIT_MODULES
+  Draw
+  DBRep
+  DrawTrSurf
+)
+
+if (WIN32)
+  list( APPEND USED_LIBS gdi32.lib )
+  list( APPEND USED_LIBS advapi32.lib )
+  list( APPEND USED_LIBS user32.lib )
+elseif(APPLE)
+  find_library(FRAMEWORKS_TCL NAMES Tcl)
+  list( APPEND USED_LIBS ${FRAMEWORKS_TCL} )
+  find_library(FRAMEWORKS_TK NAMES Tk)
+  list( APPEND USED_LIBS ${FRAMEWORKS_TK} )
+  if(USE_TBB)
+    list( APPEND USED_LIBS tbb )
+    list( APPEND USED_LIBS tbbmalloc )
+  endif()
+  list( APPEND USED_LIBS objc )
+  find_library(FRAMEWORKS_APPKIT NAMES Appkit)
+  list( APPEND USED_LIBS ${FRAMEWORKS_APPKIT} )
+  find_library(FRAMEWORKS_IOKIT NAMES IOKit)
+  list( APPEND USED_LIBS ${FRAMEWORKS_IOKIT} )
+else()
+  list( APPEND USED_LIBS tcl8.6 )
+  list( APPEND USED_LIBS X11 )
+  list( APPEND USED_LIBS tk8.6 )
+  if(USE_TBB)
+    list( APPEND USED_LIBS tbb )
+    list( APPEND USED_LIBS tbbmalloc )
+  endif()
+endif()
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKFeat/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(TKFeat)
+
+set (TOOLKIT_MODULES
+  LocOpe
+  BRepFeat
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKFillet/CMakeLists.txt

@@ -0,0 +1,15 @@
+project(TKFillet)
+
+set (TOOLKIT_MODULES
+  ChFiDS
+  ChFi2d
+  ChFi3d
+  ChFiKPart
+  Blend
+  BRepBlend
+  BlendFunc
+  BRepFilletAPI
+  FilletSurf
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKG2d/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(TKG2d)
+
+set (TOOLKIT_MODULES
+  Geom2d
+  LProp
+  TColGeom2d
+  Adaptor2d
+  Geom2dLProp
+  Geom2dAdaptor
+  GProp
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKG3d/CMakeLists.txt

@@ -0,0 +1,14 @@
+project(TKG3d)
+
+set (TOOLKIT_MODULES
+  Geom
+  TColGeom
+  GeomAdaptor
+  AdvApprox
+  GeomLProp
+  Adaptor3d
+  LProp3d
+  TopAbs
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKGeomAlgo/CMakeLists.txt

@@ -0,0 +1,39 @@
+project(TKGeomAlgo)
+
+set (TOOLKIT_MODULES
+  Hatch
+  GeomInt
+  IntStart
+  IntWalk
+  IntImp
+  IntCurveSurface
+  IntSurf
+  IntPatch
+  Geom2dInt
+  IntImpParGen
+  IntRes2d
+  IntCurve
+  TopTrans
+  Intf
+  ApproxInt
+  GccAna
+  GccEnt
+  GccInt
+  HatchGen
+  Geom2dHatch
+  Law
+  AppBlend
+  Plate
+  GeomPlate
+  LocalAnalysis
+  GeomAPI
+  GeomFill
+  Geom2dAPI
+  Geom2dGcc
+  FairCurve
+  NLPlate
+  IntPolyh
+  TopClass
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

src/TKGeomBase/CMakeLists.txt

@@ -0,0 +1,28 @@
+project(TKGeomBase)
+
+set (TOOLKIT_MODULES
+  ProjLib
+  GeomProjLib
+  GCPnts
+  CPnts
+  Approx
+  AppParCurves
+  FEmTool
+  AppCont
+  Extrema
+  IntAna
+  IntAna2d
+  GeomConvert
+  AdvApp2Var
+  GeomLib
+  Geom2dConvert
+  Hermit
+  BndLib
+  AppDef
+  GeomTools
+  GC
+  GCE2d
+  gce
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)