From: ibs <ibs@opencascade.com>
Date: Thu, 12 Nov 2015 12:28:34 +0000 (+0300)
Subject: 0026880: Configuration, CMake - platform dependent code is not generated
X-Git-Tag: V7_0_0_beta~110
X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=fb3267c7b87614ca860f3469ab9fbe8b43ee6fc2

0026880: Configuration, CMake - platform dependent code is not generated

several misprints fixed (upper case, sorting of empty list, empty parent directory)

CMake should consider CSF_ variables from EXTERNLIB file for each toolkit

CSF_ variables are defined in occt_csf for each OS
redundant CSF removed

Conflicts:
src/TKG3d/CMakeLists.txt
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a140de8c88..ef76a3627a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro")
 list (FIND BUILD_TOOLKITS TKMath   CAN_REBUILD_PDC_FOR_TKMATH)
 list (FIND BUILD_TOOLKITS StepFile CAN_REBUILD_PDC_FOR_STEPFILE)
 
-if (NOT "${CAN_REBUILD_PDC_FOR_TKMATH}" STREQUAL "-1" OR NOT "${CAN_REBUILD_PDC_FOR_STEPFILE}" STREQUAL "-1")
+if (NOT ${CAN_REBUILD_PDC_FOR_TKMATH} EQUAL -1 OR NOT ${CAN_REBUILD_PDC_FOR_STEPFILE} EQUAL -1)
   set (REBUILD_PLATFORM_DEPENDENT_CODE OFF CACHE BOOL "${REBUILD_PLATFORM_DEPENDENT_CODE_DESCR}")
 else()
   OCCT_CHECK_AND_UNSET (REBUILD_PLATFORM_DEPENDENT_CODE)
@@ -157,7 +157,7 @@ endif()
 # search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
 
-if ("${USE_TCL}" STREQUAL ON)
+if (USE_TCL)
   message (STATUS "Info: TCL is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tcl")
   
@@ -174,7 +174,7 @@ endif()
 # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
 
-if ("${USE_FREETYPE}" STREQUAL ON)
+if (USE_FREETYPE)
   message (STATUS "Info: Freetype is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
 else()
@@ -239,7 +239,6 @@ endif()
 OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS)
 
 if (NOT DEFINED ANDROID AND CAN_USE_GL2PS)
-message(STATUS "USE_GL2PS = $ENV{USE_GL2PS} or ${USE_GL2PS}")
   set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}")
 
   if (USE_GL2PS)
@@ -477,6 +476,9 @@ foreach(RESOURCE ${RESOURCES})
   endif()
 endforeach()
 
+# define CSF variable
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf")
+
 # include patched toolkit projects or original ones
 foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
   OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")
diff --git a/adm/cmake/bison.cmake b/adm/cmake/bison.cmake
index 1932a8495c..8976700918 100644
--- a/adm/cmake/bison.cmake
+++ b/adm/cmake/bison.cmake
@@ -9,7 +9,7 @@ endif()
 # BISON_EXECUTABLE is required by BISON_TARGET macro and should be defined
 set (BISON_EXECUTABLE "${3RDPARTY_BISON_EXECUTABLE}" CACHE FILEPATH "path to the bison executable" FORCE)
 
-find_package (Bison)
+find_package (BISON)
 
 if (BISON_FOUND)
   set (3RDPARTY_BISON_EXECUTABLE "${BISON_EXECUTABLE}" CACHE FILEPATH "The Path to the bison command" FORCE)
diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
new file mode 100644
index 0000000000..44d5f5bb38
--- /dev/null
+++ b/adm/cmake/occt_csf.cmake
@@ -0,0 +1,106 @@
+# CSF variables definition
+
+if (NOT DEFINED USE_TCL)
+  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
+endif()
+
+if (USE_TCL)
+  if ("${3RDPARTY_TCL_LIBRARY_VERSION}" STREQUAL "")
+    message (WARNING "TCL version has not been specified by CSF_TclLibs defining")
+    message (WARNING "thus it will be used as 8.6")
+    set (3RDPARTY_TCL_LIBRARY_VERSION "8.6")
+  endif()
+
+  if ("${3RDPARTY_TK_LIBRARY_VERSION}" STREQUAL "")
+    message (WARNING "TK version has not been specified by CSF_TclTkLibs defining")
+    message (WARNING "thus it will be used as 8.6")
+    set (3RDPARTY_TK_LIBRARY_VERSION "8.6")
+  endif()
+endif()
+
+if (USE_VTK AND NOT VTK_LIBRARY_NAMES)
+  message (WARNING "CSF_VTK specification: VTK libraries are not defined")
+endif()
+
+if (USE_TBB)
+  set (CSF_TBB "tbb tbbmalloc")
+else()
+  set (CSF_TBB)
+endif()
+
+if (WIN32)
+  set (CSF_advapi32      "advapi32.lib")
+  set (CSF_gdi32         "gdi32.lib")
+  set (CSF_user32        "user32.lib")
+  set (CSF_wsock32       "wsock32.lib")
+  set (CSF_AviLibs       "ws2_32.lib vfw32.lib")
+  set (CSF_OpenGlLibs    "opengl32.lib glu32.lib")
+
+  if (USE_TCL)
+    set (CSF_TclLibs     "tcl${3RDPARTY_TCL_LIBRARY_VERSION}.lib")
+    set (CSF_TclTkLibs   "tk${3RDPARTY_TK_LIBRARY_VERSION}.lib")
+  endif()
+
+  if (USE_VTK)
+    set (CSF_VTK "${VTK_LIBRARY_NAMES}")
+  else()
+    set (CSF_VTK)
+  endif()
+
+else()
+
+  #-- Tcl/Tk configuration
+  if (USE_TCL)
+    set (CSF_TclLibs     "tcl${3RDPARTY_TCL_LIBRARY_VERSION}")
+    set (CSF_TclTkLibs   "X11 tk${3RDPARTY_TK_LIBRARY_VERSION}")
+  endif()
+
+  if(APPLE)
+    set (CSF_objc        "objc")
+
+    # frameworks
+    set (CSF_Appkit      "Appkit")
+    set (CSF_IOKit       "IOKit")
+    set (CSF_OpenGlLibs  "OpenGL")
+    
+    set (CSF_TclLibs     "Tcl")
+    set (CSF_TclTkLibs   "Tk")
+  elseif(ANDROID)
+    set (CSF_ThreadLibs  "c")
+    set (CSF_OpenGlLibs  "EGL GLESv2")
+  elseif (UNIX)
+    set (CSF_ThreadLibs  "pthread rt")
+    set (CSF_OpenGlLibs  "GLU GL")
+  endif()
+
+  if (NOT DEFINED ANDROID)
+    set (CSF_XwLibs      "X11 Xext Xmu Xi")
+    set (CSF_MotifLibs   "X11")
+  endif()
+
+  if (USE_FREETYPE)
+    set (CSF_FREETYPE "freetype")
+  else()
+    set (CSF_FREETYPE)
+  endif()
+
+  if (USE_FREEIMAGE)
+    set (CSF_FreeImagePlus "freeimage")
+  else()
+    set (CSF_FreeImagePlus)
+  endif()
+
+  if (NOT DEFINED ANDROID)
+    if (USE_GL2PS)
+      set (CSF_GL2PS "gl2ps")
+    else()
+      set (CSF_GL2PS)
+    endif()
+  endif()
+  
+  if (USE_VTK)
+    set (CSF_VTK "${VTK_LIBRARY_NAMES}")
+  else()
+    set (CSF_VTK)
+  endif()
+endif()
\ No newline at end of file
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
index 96f9fc66d2..e7d371568c 100644
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -1,11 +1,25 @@
 # script for each OCCT toolkit
 
+# parce PACKAGES file
+if ("${PROJECT_NAME}" STREQUAL DRAWEXE)
+  set (USED_PACKAGES DRAWEXE)
+else()
+  FILE_TO_LIST ("src/${PROJECT_NAME}/PACKAGES" USED_PACKAGES)
+endif()
+
+set (PRECOMPILED_DEFS)
+
 # Get all used packages from toolkit
-foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
+foreach (OCCT_PACKAGE ${USED_PACKAGES})
+  
+  # TKService contains platform-dependent packages: Xw and WNT
+  if ((WIN32 AND "${OCCT_PACKAGE}" STREQUAL "Xw") OR (NOT WIN32 AND "${OCCT_PACKAGE}" STREQUAL "WNT"))
+    continue()
+  endif()
+
   if (WIN32)
     list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
   endif()
-  # ${OCCT_SOURCE_DIR}/src/${OCCT_PACKAGE}
 
   set (SOURCE_FILES)
   set (HEADER_FILES)
@@ -16,14 +30,15 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
     # flex files
     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
     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)
 
     if (${SOURCE_FILES_FLEX_LEN} EQUAL ${SOURCE_FILES_BISON_LEN} AND NOT ${SOURCE_FILES_FLEX_LEN} EQUAL 0)
+    
+      list (SORT SOURCE_FILES_FLEX)
+      list (SORT SOURCE_FILES_BISON)
 
       math (EXPR SOURCE_FILES_FLEX_LEN "${SOURCE_FILES_FLEX_LEN} - 1")
       foreach (FLEX_FILE_INDEX RANGE ${SOURCE_FILES_FLEX_LEN})
@@ -39,10 +54,10 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
         if (EXISTS "${CURRENT_FLEX_FILE}" AND EXISTS "${CURRENT_BISON_FILE}" AND ${ARE_FILES_EQUAL})
           set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.c)
           set (FLEX_OUTPUT_FILE lex.${CURRENT_FLEX_FILE_NAME}.c)
-          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMP_DIR}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
-          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMP_DIR}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
+          BISON_TARGET (Parser_${CURRENT_BISON_FILE_NAME} ${CURRENT_BISON_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${BISON_OUTPUT_FILE} COMPILE_FLAGS "-p ${CURRENT_BISON_FILE_NAME}")
+          FLEX_TARGET  (Scanner_${CURRENT_FLEX_FILE_NAME} ${CURRENT_FLEX_FILE} ${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${FLEX_OUTPUT_FILE} COMPILE_FLAGS "-P${CURRENT_FLEX_FILE_NAME}")
           ADD_FLEX_BISON_DEPENDENCY (Scanner_${CURRENT_FLEX_FILE_NAME} Parser_${CURRENT_BISON_FILE_NAME})
-
+         
           list (APPEND SOURCE_FILES ${BISON_OUTPUT_FILE} ${FLEX_OUTPUT_FILE})
         endif()
       endforeach()
@@ -100,64 +115,79 @@ foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
 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}")
+if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
+  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS Release
+           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+else()
+  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
+
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS Release
+           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
+           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS RelWithDebInfo
+           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
+           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+  install (TARGETS ${PROJECT_NAME}
+           CONFIGURATIONS Debug
+           RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
+           ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+           LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+  if (MSVC)
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  endif()
+endif()
+
+set (CURRENT_MODULE)
+foreach (OCCT_MODULE ${OCCT_MODULES})
+  list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
+  if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
+    set (CURRENT_MODULE ${OCCT_MODULE})
   endif()
 endforeach()
 
-# Create project for toolkit
-list (FIND BUILD_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
-if ("${BUILD_TOOLKITS}" STREQUAL "" OR NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
+if (CURRENT_MODULE)
+  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
+endif()
 
-  foreach (OCCT_MODULE ${OCCT_MODULES})
-    list (FIND ${OCCT_MODULE}_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
-    if (NOT ${CURRENT_PROJECT_IS_BUILT} EQUAL -1)
-      set (CURRENT_MODULE ${OCCT_MODULE})
-    endif()
-  endforeach()
-  
-  if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
-    add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
-
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
+
+set (USED_TOOLKITS_BY_CURRENT_PROJECT)
+set (USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT)
+
+# parce EXTERNLIB file
+FILE_TO_LIST ("src/${PROJECT_NAME}/EXTERNLIB" USED_EXTERNLIB_AND_TOOLKITS)
+foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
+  string (REGEX MATCH "^TK" TK_FOUND ${USED_ITEM})
+  if (NOT "${TK_FOUND}" STREQUAL "")
+    list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
   else()
-    add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES})
-
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS Release
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS RelWithDebInfo
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-    install (TARGETS ${PROJECT_NAME}
-             CONFIGURATIONS Debug
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
-    if (MSVC)
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
-               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+    string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
+    if ("${CSF_FOUND}" STREQUAL "")
+      message (STATUS "Info: ${USED_ITEM} from ${PROJECT_NAME} skipped due to it is empty")
+    else() # get CSF_ value
+      set (CURRENT_CSF ${${USED_ITEM}})
+      if (NOT "${CURRENT_CSF}" STREQUAL "")
+        # prepare a list from a string with whitespaces
+        separate_arguments (CURRENT_CSF)
+        list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
+      endif()
     endif()
   endif()
+endforeach()
 
-  set_property (TARGET ${PROJECT_NAME} PROPERTY FOLDER "Modules/${CURRENT_MODULE}")
-  set_target_properties (${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${PRECOMPILED_DEFS}")
-  target_link_libraries (${PROJECT_NAME} ${USED_LIBS})
-endif()
\ No newline at end of file
+target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake
index 7ccb28d9a3..94462609a0 100644
--- a/adm/cmake/vtk.cmake
+++ b/adm/cmake/vtk.cmake
@@ -66,43 +66,57 @@ if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
 endif()
 
 # vtk libraries
-# lib
-set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.lib vtkCommonDataModel-${VTK_VERSION}.lib vtkCommonExecutionModel-${VTK_VERSION}.lib
-                       vtkCommonMath-${VTK_VERSION}.lib vtkCommonTransforms-${VTK_VERSION}.lib vtkRenderingCore-${VTK_VERSION}.lib
-                       vtkRenderingOpenGL-${VTK_VERSION}.lib vtkFiltersGeneral-${VTK_VERSION}.lib vtkIOCore-${VTK_VERSION}.lib
-                       vtkIOImage-${VTK_VERSION}.lib vtkImagingCore-${VTK_VERSION}.lib vtkInteractionStyle-${VTK_VERSION}.lib )
+set (VTK_LIB_EXTENSION so.1)
+set (VTK_DLL_EXTENSION so.1)
+if (WIN32)
+  set (VTK_LIB_EXTENSION lib)
+  set (VTK_DLL_EXTENSION dll)
+endif()
+
+set (VTK_LIBRARY_NAMES vtkCommonCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkCommonDataModel-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkCommonExecutionModel-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkCommonMath-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkCommonTransforms-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkRenderingCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkRenderingOpenGL-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkFiltersGeneral-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkIOCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkIOImage-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkImagingCore-${VTK_VERSION}.${VTK_LIB_EXTENSION}
+                       vtkInteractionStyle-${VTK_VERSION}.${VTK_LIB_EXTENSION})
 
 #dll
-set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.dll
-                   vtkCommonCore-${VTK_VERSION}.dll
-                   vtkCommonDataModel-${VTK_VERSION}.dll
-                   vtkCommonExecutionModel-${VTK_VERSION}.dll
-                   vtkCommonMath-${VTK_VERSION}.dll
-                   vtkCommonMisc-${VTK_VERSION}.dll
-                   vtkCommonSystem-${VTK_VERSION}.dll
-                   vtkCommonTransforms-${VTK_VERSION}.dll
-                   vtkDICOMParser-${VTK_VERSION}.dll
-                   vtkFiltersCore-${VTK_VERSION}.dll
-                   vtkFiltersExtraction-${VTK_VERSION}.dll
-                   vtkFiltersGeneral-${VTK_VERSION}.dll
-                   vtkFiltersGeometry-${VTK_VERSION}.dll
-                   vtkFiltersSources-${VTK_VERSION}.dll
-                   vtkFiltersStatistics-${VTK_VERSION}.dll
-                   vtkIOCore-${VTK_VERSION}.dll
-                   vtkIOImage-${VTK_VERSION}.dll
-                   vtkImagingCore-${VTK_VERSION}.dll
-                   vtkImagingFourier-${VTK_VERSION}.dll
-                   vtkImagingHybrid-${VTK_VERSION}.dll
-                   vtkInteractionStyle-${VTK_VERSION}.dll
-                   vtkRenderingCore-${VTK_VERSION}.dll
-                   vtkRenderingOpenGL-${VTK_VERSION}.dll
-                   vtkalglib-${VTK_VERSION}.dll
-                   vtkjpeg-${VTK_VERSION}.dll
-                   vtkmetaio-${VTK_VERSION}.dll
-                   vtkpng-${VTK_VERSION}.dll
-                   vtksys-${VTK_VERSION}.dll
-                   vtktiff-${VTK_VERSION}.dll
-                   vtkzlib-${VTK_VERSION}.dll )
+set (VTK_DLL_NAMES vtkCommonComputationalGeometry-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonDataModel-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonExecutionModel-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonMath-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonMisc-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonSystem-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkCommonTransforms-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkDICOMParser-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersExtraction-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersGeneral-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersGeometry-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersSources-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkFiltersStatistics-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkIOCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkIOImage-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkImagingCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkImagingFourier-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkImagingHybrid-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkInteractionStyle-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkRenderingCore-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkRenderingOpenGL-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkalglib-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkjpeg-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkmetaio-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkpng-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtksys-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtktiff-${VTK_VERSION}.${VTK_DLL_EXTENSION}
+                   vtkzlib-${VTK_VERSION}.${VTK_DLL_EXTENSION} )
 
 # search for dll directory
 if (WIN32)
@@ -130,12 +144,15 @@ endif()
 if (INSTALL_VTK)
   OCCT_MAKE_OS_WITH_BITNESS()
   OCCT_MAKE_COMPILER_SHORT_NAME()
+
   if (WIN32)
     if(3RDPARTY_VTK_DLL_DIR AND EXISTS "${3RDPARTY_VTK_DLL_DIR}")
       set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
       foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
+        
         set (3RDPARTY_VTK_DLL "3RDPARTY_VTK_DLL-NOTFOUND" CACHE FILEPATH "VTK shared library" FORCE)
         find_library(3RDPARTY_VTK_DLL "${VTK_DLL_NAME}" PATHS "${3RDPARTY_VTK_DLL_DIR}" NO_DEFAULT_PATH)
+        
         if (NOT 3RDPARTY_VTK_DLL OR NOT EXISTS "${3RDPARTY_VTK_DLL}")
           list (APPEND 3RDPARTY_NOT_INCLUDED "${3RDPARTY_VTK_DLL}")
         else()
@@ -154,7 +171,6 @@ if (INSTALL_VTK)
     endif()
   else ()
     foreach(VTK_DLL_NAME ${VTK_DLL_NAMES})
-      string(REPLACE ".dll" ".so.1" VTK_DLL_NAME "${VTK_DLL_NAME}")
       install(FILES "${3RDPARTY_VTK_LIBRARY_DIR}/lib${VTK_DLL_NAME}"
               CONFIGURATIONS Release
               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
diff --git a/adm/templates/env.bat b/adm/templates/env.bat
index 02cca18721..68024b0d56 100644
--- a/adm/templates/env.bat
+++ b/adm/templates/env.bat
@@ -22,7 +22,6 @@ set "HAVE_TBB=false"
 set "HAVE_OPENCL=false"
 set "HAVE_FREEIMAGE=false"
 set "HAVE_GL2PS=false"
-set "HAVE_OPENCL=false"
 set "HAVE_VTK=false"
 set "HAVE_D3D=false"
 set "CSF_OPT_INC="
diff --git a/src/DRAWEXE/CMakeLists.txt b/src/DRAWEXE/CMakeLists.txt
index ad8ea8159b..11673ed63a 100644
--- a/src/DRAWEXE/CMakeLists.txt
+++ b/src/DRAWEXE/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(DRAWEXE)
 
-set (TOOLKIT_MODULES
-  DRAWEXE
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBO/CMakeLists.txt b/src/TKBO/CMakeLists.txt
index 9c5c01e12d..b1d3520d70 100644
--- a/src/TKBO/CMakeLists.txt
+++ b/src/TKBO/CMakeLists.txt
@@ -1,12 +1,3 @@
 project(TKBO)
 
-set (TOOLKIT_MODULES
-  IntTools
-  BRepAlgoAPI
-  BOPCol
-  BOPDS
-  BOPAlgo
-  BOPTools
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBRep/CMakeLists.txt b/src/TKBRep/CMakeLists.txt
index 182c73ed21..f4a40146aa 100644
--- a/src/TKBRep/CMakeLists.txt
+++ b/src/TKBRep/CMakeLists.txt
@@ -1,14 +1,3 @@
 project(TKBRep)
 
-set (TOOLKIT_MODULES
-  TopoDS
-  TopExp
-  TopTools
-  BRep
-  BRepLProp
-  BRepAdaptor
-  BRepTools
-  BinTools
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBin/CMakeLists.txt b/src/TKBin/CMakeLists.txt
index 327e9ac911..9111f3011a 100644
--- a/src/TKBin/CMakeLists.txt
+++ b/src/TKBin/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKBin)
 
-set (TOOLKIT_MODULES
-  BinDrivers
-  BinMDataXtd
-  BinMPrsStd
-  BinMNaming
-)
-
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
\ No newline at end of file
diff --git a/src/TKBinL/CMakeLists.txt b/src/TKBinL/CMakeLists.txt
index 8f23d849a7..0161b65d84 100644
--- a/src/TKBinL/CMakeLists.txt
+++ b/src/TKBinL/CMakeLists.txt
@@ -1,12 +1,3 @@
 project(TKBinL)
 
-set (TOOLKIT_MODULES
-  BinMDF
-  BinMDataStd
-  BinMFunction
-  BinMDocStd
-  BinObjMgt
-  BinLDrivers
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBinTObj/CMakeLists.txt b/src/TKBinTObj/CMakeLists.txt
index cfc6a3f655..12acbc5133 100644
--- a/src/TKBinTObj/CMakeLists.txt
+++ b/src/TKBinTObj/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKBinTObj)
 
-set (TOOLKIT_MODULES
-  BinTObjDrivers
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBinXCAF/CMakeLists.txt b/src/TKBinXCAF/CMakeLists.txt
index 86ad17d619..281688469a 100644
--- a/src/TKBinXCAF/CMakeLists.txt
+++ b/src/TKBinXCAF/CMakeLists.txt
@@ -1,8 +1,3 @@
 project(TKBinXCAF)
 
-set (TOOLKIT_MODULES
-  BinXCAFDrivers
-  BinMXCAFDoc
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKBool/CMakeLists.txt b/src/TKBool/CMakeLists.txt
index d09cd4e183..9bb388fdca 100644
--- a/src/TKBool/CMakeLists.txt
+++ b/src/TKBool/CMakeLists.txt
@@ -1,13 +1,3 @@
 project(TKBool)
 
-set (TOOLKIT_MODULES
-  TopOpeBRep
-  TopOpeBRepDS
-  TopOpeBRepBuild
-  TopOpeBRepTool
-  BRepAlgo
-  BRepFill
-  BRepProj
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKCAF/CMakeLists.txt b/src/TKCAF/CMakeLists.txt
index 886ba3fd05..9f5d372dc3 100644
--- a/src/TKCAF/CMakeLists.txt
+++ b/src/TKCAF/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKCAF)
 
-set (TOOLKIT_MODULES
-  TDataXtd
-  TNaming
-  TPrsStd
-  AppStd
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKCDF/CMakeLists.txt b/src/TKCDF/CMakeLists.txt
index 88612f8661..e55eed9bea 100644
--- a/src/TKCDF/CMakeLists.txt
+++ b/src/TKCDF/CMakeLists.txt
@@ -1,11 +1,3 @@
 project(TKCDF)
 
-set (TOOLKIT_MODULES
-  CDM
-  PCDM
-  CDF
-  UTL
-  LDOM
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKD3DHost/CMakeLists.txt b/src/TKD3DHost/CMakeLists.txt
index 366a7b1c7b..f3cb12afc0 100644
--- a/src/TKD3DHost/CMakeLists.txt
+++ b/src/TKD3DHost/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKD3DHost)
 
-set (TOOLKIT_MODULES
-  D3DHost
-)
-
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKDCAF/CMakeLists.txt b/src/TKDCAF/CMakeLists.txt
index 2e2738c3ae..a1e97bc170 100644
--- a/src/TKDCAF/CMakeLists.txt
+++ b/src/TKDCAF/CMakeLists.txt
@@ -1,12 +1,3 @@
 project(TKDCAF)
 
-set (TOOLKIT_MODULES
-  DDF
-  DDocStd
-  DNaming
-  DDataStd
-  DPrsStd
-  DrawDim
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKDraw/CMakeLists.txt b/src/TKDraw/CMakeLists.txt
index 00a699d829..eca90dca5d 100644
--- a/src/TKDraw/CMakeLists.txt
+++ b/src/TKDraw/CMakeLists.txt
@@ -1,34 +1,3 @@
 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} )
-  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 )
-endif()
-
-if(USE_TBB)
-  list( APPEND USED_LIBS tbb )
-  list( APPEND USED_LIBS tbbmalloc )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKFeat/CMakeLists.txt b/src/TKFeat/CMakeLists.txt
index 3a6e6872e7..819643bbec 100644
--- a/src/TKFeat/CMakeLists.txt
+++ b/src/TKFeat/CMakeLists.txt
@@ -1,8 +1,3 @@
 project(TKFeat)
 
-set (TOOLKIT_MODULES
-  LocOpe
-  BRepFeat
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKFillet/CMakeLists.txt b/src/TKFillet/CMakeLists.txt
index 61177a54c8..c2ca7d67ee 100644
--- a/src/TKFillet/CMakeLists.txt
+++ b/src/TKFillet/CMakeLists.txt
@@ -1,15 +1,3 @@
 project(TKFillet)
 
-set (TOOLKIT_MODULES
-  ChFiDS
-  ChFi2d
-  ChFi3d
-  ChFiKPart
-  Blend
-  BRepBlend
-  BlendFunc
-  BRepFilletAPI
-  FilletSurf
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKG2d/CMakeLists.txt b/src/TKG2d/CMakeLists.txt
index 3db53a209e..e9f8f6c701 100644
--- a/src/TKG2d/CMakeLists.txt
+++ b/src/TKG2d/CMakeLists.txt
@@ -1,13 +1,3 @@
 project(TKG2d)
 
-set (TOOLKIT_MODULES
-  Geom2d
-  LProp
-  TColGeom2d
-  Adaptor2d
-  Geom2dLProp
-  Geom2dAdaptor
-  GProp
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKG3d/CMakeLists.txt b/src/TKG3d/CMakeLists.txt
index 3a55db2928..02b023b24e 100644
--- a/src/TKG3d/CMakeLists.txt
+++ b/src/TKG3d/CMakeLists.txt
@@ -1,15 +1,3 @@
 project(TKG3d)
 
-set (TOOLKIT_MODULES
-  Geom
-  TColGeom
-  GeomAdaptor
-  AdvApprox
-  GeomLProp
-  Adaptor3d
-  LProp3d
-  TopAbs
-  GeomEvaluator
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKGeomAlgo/CMakeLists.txt b/src/TKGeomAlgo/CMakeLists.txt
index 149dbbf00d..8a4b5468be 100644
--- a/src/TKGeomAlgo/CMakeLists.txt
+++ b/src/TKGeomAlgo/CMakeLists.txt
@@ -1,39 +1,3 @@
 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
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKGeomBase/CMakeLists.txt b/src/TKGeomBase/CMakeLists.txt
index 03b3d28cd1..5467589c65 100644
--- a/src/TKGeomBase/CMakeLists.txt
+++ b/src/TKGeomBase/CMakeLists.txt
@@ -1,28 +1,3 @@
 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
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKHLR/CMakeLists.txt b/src/TKHLR/CMakeLists.txt
index da9dcbc9a6..acd009b3ef 100644
--- a/src/TKHLR/CMakeLists.txt
+++ b/src/TKHLR/CMakeLists.txt
@@ -1,14 +1,3 @@
 project(TKHLR)
 
-set (TOOLKIT_MODULES
-  HLRTopoBRep
-  HLRBRep
-  HLRAlgo
-  HLRAppli
-  Intrv
-  TopBas
-  TopCnx
-  Contap
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKIGES/CMakeLists.txt b/src/TKIGES/CMakeLists.txt
index 19795a41cb..383e62f9f7 100644
--- a/src/TKIGES/CMakeLists.txt
+++ b/src/TKIGES/CMakeLists.txt
@@ -1,24 +1,3 @@
 project(TKIGES)
 
-set (TOOLKIT_MODULES
-  IGESData
-  IGESFile
-  IGESBasic
-  IGESGraph
-  IGESGeom
-  IGESDimen
-  IGESDraw
-  IGESSolid
-  IGESDefs
-  IGESAppli
-  IGESConvGeom
-  IGESSelect
-  IGESToBRep
-  GeomToIGES
-  Geom2dToIGES
-  BRepToIGES
-  BRepToIGESBRep
-  IGESControl
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKIVtk/CMakeLists.txt b/src/TKIVtk/CMakeLists.txt
index 118e42c90d..79e84e99a1 100644
--- a/src/TKIVtk/CMakeLists.txt
+++ b/src/TKIVtk/CMakeLists.txt
@@ -1,19 +1,3 @@
 project(TKIVtk)
 
-set (TOOLKIT_MODULES
-  IVtk
-  IVtkOCC
-  IVtkVTK
-  IVtkTools
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS ${VTK_LIBRARY_NAMES} )
-else()
-  foreach(VTK_LIB_NAME ${VTK_LIBRARY_NAMES})
-    string(REPLACE ".lib" ".so.1" VTK_LIB_NAME ${VTK_LIB_NAME})
-    list( APPEND USED_LIBS "lib${VTK_LIB_NAME}")
-  endforeach()
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKIVtkDraw/CMakeLists.txt b/src/TKIVtkDraw/CMakeLists.txt
index 3e592fb6fb..a858e82911 100644
--- a/src/TKIVtkDraw/CMakeLists.txt
+++ b/src/TKIVtkDraw/CMakeLists.txt
@@ -1,16 +1,3 @@
 project(TKIVtkDraw)
 
-set (TOOLKIT_MODULES
-  IVtkDraw
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS ${VTK_LIBRARY_NAMES} )
-else()
-  foreach(VTK_LIB_NAME ${VTK_LIBRARY_NAMES})
-    string(REPLACE ".lib" ".so.1" VTK_LIB_NAME ${VTK_LIB_NAME})
-    list( APPEND USED_LIBS "lib${VTK_LIB_NAME}")
-  endforeach()
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKLCAF/CMakeLists.txt b/src/TKLCAF/CMakeLists.txt
index 295932dc5d..d9ae756841 100644
--- a/src/TKLCAF/CMakeLists.txt
+++ b/src/TKLCAF/CMakeLists.txt
@@ -1,11 +1,3 @@
 project(TKLCAF)
 
-set (TOOLKIT_MODULES
-  TDF
-  TDataStd
-  TFunction
-  TDocStd
-  AppStdL
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKMath/CMakeLists.txt b/src/TKMath/CMakeLists.txt
index eaccbb22c9..b0ba442d83 100644
--- a/src/TKMath/CMakeLists.txt
+++ b/src/TKMath/CMakeLists.txt
@@ -1,24 +1,3 @@
 project(TKMath)
 
-set (TOOLKIT_MODULES
-  math
-  ElCLib
-  ElSLib
-  BSplCLib
-  BSplSLib
-  PLib
-  Precision
-  GeomAbs
-  Poly
-  CSLib
-  Convert
-  Bnd
-  BVH
-  gp
-  TColgp
-  TopLoc
-  Expr
-  ExprIntrp
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKMesh/CMakeLists.txt b/src/TKMesh/CMakeLists.txt
index da43fb4a95..c63df5aa58 100644
--- a/src/TKMesh/CMakeLists.txt
+++ b/src/TKMesh/CMakeLists.txt
@@ -1,12 +1,3 @@
 project(TKMesh)
 
-set (TOOLKIT_MODULES
-  BRepMesh
-)
-
-if(USE_TBB)
-  list( APPEND USED_LIBS tbb )
-  list( APPEND USED_LIBS tbbmalloc )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKMeshVS/CMakeLists.txt b/src/TKMeshVS/CMakeLists.txt
index aa449903ed..cca4db24da 100644
--- a/src/TKMeshVS/CMakeLists.txt
+++ b/src/TKMeshVS/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKMeshVS)
 
-set (TOOLKIT_MODULES
-  MeshVS
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKOffset/CMakeLists.txt b/src/TKOffset/CMakeLists.txt
index da0cbf3fbd..1f5a44d1b0 100644
--- a/src/TKOffset/CMakeLists.txt
+++ b/src/TKOffset/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKOffset)
 
-set (TOOLKIT_MODULES
-  BRepOffsetAPI
-  Draft
-  BRepOffset
-  BiTgte
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKOpenGl/CMakeLists.txt b/src/TKOpenGl/CMakeLists.txt
index ad0094f954..ef9a09b27e 100644
--- a/src/TKOpenGl/CMakeLists.txt
+++ b/src/TKOpenGl/CMakeLists.txt
@@ -1,37 +1,3 @@
 project(TKOpenGl)
 
-set (TOOLKIT_MODULES
-  OpenGl
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS opengl32.lib )
-  list( APPEND USED_LIBS user32.lib )
-  list( APPEND USED_LIBS gdi32.lib )
-  list( APPEND USED_LIBS ws2_32.lib )
-  list( APPEND USED_LIBS vfw32.lib )
-elseif(APPLE)
-  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
-  if(USE_GLX)
-    list( APPEND USED_LIBS GL )
-  else()
-    list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
-  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} )
-  list( APPEND USED_LIBS freetype )
-else()
-  list( APPEND USED_LIBS GL )
-  list( APPEND USED_LIBS freetype )
-endif()
-
-if (NOT WIN32)
-  if(USE_GL2PS)
-    list( APPEND USED_LIBS gl2ps )
-  endif()
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKPrim/CMakeLists.txt b/src/TKPrim/CMakeLists.txt
index 925d33237c..d0f3d2e2f6 100644
--- a/src/TKPrim/CMakeLists.txt
+++ b/src/TKPrim/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKPrim)
 
-set (TOOLKIT_MODULES
-  BRepPrim
-  BRepSweep
-  Sweep
-  BRepPrimAPI
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKQADraw/CMakeLists.txt b/src/TKQADraw/CMakeLists.txt
index d238275960..61a973444a 100644
--- a/src/TKQADraw/CMakeLists.txt
+++ b/src/TKQADraw/CMakeLists.txt
@@ -1,24 +1,3 @@
 project(TKQADraw)
 
-set (TOOLKIT_MODULES
-  QABugs
-  QADNaming
-  QADraw
-  QANCollection
-  QANewBRepNaming
-  QANewDBRepNaming
-  QANewModTopOpe
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS gdi32.lib )
-  list( APPEND USED_LIBS advapi32.lib )
-  list( APPEND USED_LIBS user32.lib )
-endif()
-
-if(USE_TBB)
-  list( APPEND USED_LIBS tbb )
-  list( APPEND USED_LIBS tbbmalloc )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEP/CMakeLists.txt b/src/TKSTEP/CMakeLists.txt
index 3addda0aa0..2885f9b8e9 100644
--- a/src/TKSTEP/CMakeLists.txt
+++ b/src/TKSTEP/CMakeLists.txt
@@ -1,25 +1,3 @@
 project(TKSTEP)
 
-set (TOOLKIT_MODULES
-  StepAP214
-  RWStepAP214
-  StepAP203
-  RWStepAP203
-  STEPConstruct
-  STEPEdit
-  GeomToStep
-  StepToGeom
-  StepToTopoDS
-  TopoDSToStep
-  STEPControl
-  STEPSelections
-  StepAP209
-  StepAP242
-  RWStepAP242
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS wsock32.lib )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEP209/CMakeLists.txt b/src/TKSTEP209/CMakeLists.txt
index fc84a2571f..78e09c5b81 100644
--- a/src/TKSTEP209/CMakeLists.txt
+++ b/src/TKSTEP209/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKSTEP209)
 
-set (TOOLKIT_MODULES
-  StepElement
-  StepFEA
-  RWStepElement
-  RWStepFEA
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEPAttr/CMakeLists.txt b/src/TKSTEPAttr/CMakeLists.txt
index 802c091d09..59e2527fd2 100644
--- a/src/TKSTEPAttr/CMakeLists.txt
+++ b/src/TKSTEPAttr/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKSTEPAttr)
 
-set (TOOLKIT_MODULES
-  StepVisual
-  RWStepVisual
-  StepDimTol
-  RWStepDimTol
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTEPBase/CMakeLists.txt b/src/TKSTEPBase/CMakeLists.txt
index 105276d274..fda0c4623b 100644
--- a/src/TKSTEPBase/CMakeLists.txt
+++ b/src/TKSTEPBase/CMakeLists.txt
@@ -1,14 +1,3 @@
 project(TKSTEPBase)
 
-set (TOOLKIT_MODULES
-  StepBasic
-  RWStepBasic
-  StepRepr
-  RWStepRepr
-  StepGeom
-  RWStepGeom
-  StepShape
-  RWStepShape
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKSTL/CMakeLists.txt b/src/TKSTL/CMakeLists.txt
index 345d1c537d..2fe1c1706d 100644
--- a/src/TKSTL/CMakeLists.txt
+++ b/src/TKSTL/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKSTL)
 
-set (TOOLKIT_MODULES
-  StlMesh
-  StlAPI
-  StlTransfer
-  RWStl
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKService/CMakeLists.txt b/src/TKService/CMakeLists.txt
index 8290ea104a..90c6b1e1a6 100644
--- a/src/TKService/CMakeLists.txt
+++ b/src/TKService/CMakeLists.txt
@@ -1,55 +1,3 @@
 project(TKService)
 
-set (TOOLKIT_MODULES
-  Aspect
-  InterfaceGraphic
-  SelectBasics
-  Image
-  Cocoa
-  TColQuantity
-  Font
-)
-
-if (WIN32)
-  list( APPEND TOOLKIT_MODULES "WNT" )
-else()
-  list( APPEND TOOLKIT_MODULES "Xw" )
-endif()
-
-if (WIN32)
-  list( APPEND USED_LIBS opengl32.lib )
-elseif(APPLE)
-  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
-  if(USE_GLX)
-    list( APPEND USED_LIBS GL )
-    find_package(X11 COMPONENTS X11 Xext Xmu Xi)
-    list( APPEND USED_LIBS ${X11_LIBRARIES} )
-    list( APPEND USED_LIBS ${X11_Xi_LIB} )
-    list( APPEND USED_LIBS ${X11_Xmu_LIB} )
-    list( APPEND USED_LIBS Xext )
-    list( APPEND USED_LIBS Xmu )
-    list( APPEND USED_LIBS Xi )
-  else()
-    list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
-  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 GL )
-  list( APPEND USED_LIBS X11 )
-  list( APPEND USED_LIBS Xext )
-  list( APPEND USED_LIBS Xmu )
-  list( APPEND USED_LIBS Xi )
-endif()
-
-if (NOT WIN32)
-  if(USE_FREEIMAGE)
-    list( APPEND USED_LIBS freeimage )
-  endif()
-  list( APPEND USED_LIBS freetype )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKShHealing/CMakeLists.txt b/src/TKShHealing/CMakeLists.txt
index 04024e3df7..8cbc78dc4b 100644
--- a/src/TKShHealing/CMakeLists.txt
+++ b/src/TKShHealing/CMakeLists.txt
@@ -1,20 +1,3 @@
 project(TKShHealing)
 
-set (TOOLKIT_MODULES
-  ShapeBuild
-  ShapeExtend
-  ShapeConstruct
-  ShapeCustom
-  ShapeAnalysis
-  ShapeFix
-  ShapeUpgrade
-  ShapeAlgo
-  ShapeProcess
-  ShapeProcessAPI
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS wsock32.lib )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKTObj/CMakeLists.txt b/src/TKTObj/CMakeLists.txt
index 1855e40f8a..5a45f99b75 100644
--- a/src/TKTObj/CMakeLists.txt
+++ b/src/TKTObj/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKTObj)
 
-set (TOOLKIT_MODULES
-  TObj
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKTObjDRAW/CMakeLists.txt b/src/TKTObjDRAW/CMakeLists.txt
index ddd0335da2..b3f403af75 100644
--- a/src/TKTObjDRAW/CMakeLists.txt
+++ b/src/TKTObjDRAW/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKTObjDRAW)
 
-set (TOOLKIT_MODULES
-  TObjDRAW
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKTopAlgo/CMakeLists.txt b/src/TKTopAlgo/CMakeLists.txt
index a04bfc7f8a..4b9e242307 100644
--- a/src/TKTopAlgo/CMakeLists.txt
+++ b/src/TKTopAlgo/CMakeLists.txt
@@ -1,22 +1,3 @@
 project(TKTopAlgo)
 
-set (TOOLKIT_MODULES
-  IntCurvesFace
-  MAT
-  MAT2d
-  Bisector
-  BRepMAT2d
-  BRepCheck
-  BRepBndLib
-  BRepExtrema
-  BRepClass
-  BRepClass3d
-  BRepLib
-  BRepGProp
-  BRepIntCurveSurface
-  BRepTopAdaptor
-  BRepBuilderAPI
-  BRepApprox
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKTopTest/CMakeLists.txt b/src/TKTopTest/CMakeLists.txt
index ba8710b4dd..1686238ea9 100644
--- a/src/TKTopTest/CMakeLists.txt
+++ b/src/TKTopTest/CMakeLists.txt
@@ -1,17 +1,3 @@
 project(TKTopTest)
 
-set (TOOLKIT_MODULES
-  TestTopOpeDraw
-  TestTopOpeTools
-  TestTopOpe
-  BRepTest
-  GeometryTest
-  HLRTest
-  MeshTest
-  GeomliteTest
-  DrawFairCurve
-  BOPTest
-  SWDRAW
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKV3d/CMakeLists.txt b/src/TKV3d/CMakeLists.txt
index bc733536f6..1fa271d26d 100644
--- a/src/TKV3d/CMakeLists.txt
+++ b/src/TKV3d/CMakeLists.txt
@@ -1,33 +1,3 @@
 project(TKV3d)
 
-set (TOOLKIT_MODULES
-  V3d
-  Graphic3d
-  Select3D
-  Prs3d
-  StdPrs
-  SelectMgr
-  PrsMgr
-  AIS
-  DsgPrs
-  StdSelect
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS user32.lib )
-  list( APPEND USED_LIBS gdi32.lib )
-  list( APPEND USED_LIBS opengl32.lib )
-elseif(APPLE)
-  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
-  if(USE_GLX)
-    list( APPEND USED_LIBS GL )
-  else()
-    list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
-  endif()
-  list( APPEND USED_LIBS freetype )
-else()
-  list( APPEND USED_LIBS GL )
-  list( APPEND USED_LIBS freetype )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKVRML/CMakeLists.txt b/src/TKVRML/CMakeLists.txt
index e69bbe6f1c..959447f182 100644
--- a/src/TKVRML/CMakeLists.txt
+++ b/src/TKVRML/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKVRML)
 
-set (TOOLKIT_MODULES
-  VrmlConverter
-  VrmlAPI
-  Vrml
-  VrmlData
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKViewerTest/CMakeLists.txt b/src/TKViewerTest/CMakeLists.txt
index d51bb0d198..7f8a122f85 100644
--- a/src/TKViewerTest/CMakeLists.txt
+++ b/src/TKViewerTest/CMakeLists.txt
@@ -1,36 +1,3 @@
 project(TKViewerTest)
 
-set (TOOLKIT_MODULES
-  ViewerTest
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS user32.lib )
-  list( APPEND USED_LIBS gdi32.lib )
-  list( APPEND USED_LIBS opengl32.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} )
-  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)
-  if(USE_GLX)
-    list( APPEND USED_LIBS GL )
-  else()
-    list( APPEND USED_LIBS ${FRAMEWORKS_OPENGL} )
-  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} )
-  list( APPEND USED_LIBS freetype )
-else()
-  list( APPEND USED_LIBS tcl8.6 )
-  list( APPEND USED_LIBS X11 )
-  list( APPEND USED_LIBS tk8.6 )
-  list( APPEND USED_LIBS GL )
-  list( APPEND USED_LIBS freetype )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXCAF/CMakeLists.txt b/src/TKXCAF/CMakeLists.txt
index 4501bc2700..4262ce1bd4 100644
--- a/src/TKXCAF/CMakeLists.txt
+++ b/src/TKXCAF/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKXCAF)
 
-set (TOOLKIT_MODULES
-  XCAFApp
-  XCAFDimTolObjects
-  XCAFDoc
-  XCAFPrs
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEDRAW/CMakeLists.txt b/src/TKXDEDRAW/CMakeLists.txt
index 858052aa9a..918e593cc2 100644
--- a/src/TKXDEDRAW/CMakeLists.txt
+++ b/src/TKXDEDRAW/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKXDEDRAW)
 
-set (TOOLKIT_MODULES
-  XDEDRAW
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDEIGES/CMakeLists.txt b/src/TKXDEIGES/CMakeLists.txt
index f123c57fc2..1b18c66327 100644
--- a/src/TKXDEIGES/CMakeLists.txt
+++ b/src/TKXDEIGES/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKXDEIGES)
 
-set (TOOLKIT_MODULES
-  IGESCAFControl
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXDESTEP/CMakeLists.txt b/src/TKXDESTEP/CMakeLists.txt
index 4cbc3b6c3e..29d0ca86d8 100644
--- a/src/TKXDESTEP/CMakeLists.txt
+++ b/src/TKXDESTEP/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKXDESTEP)
 
-set (TOOLKIT_MODULES
-  STEPCAFControl
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXMesh/CMakeLists.txt b/src/TKXMesh/CMakeLists.txt
index d83370ba25..611df037d7 100644
--- a/src/TKXMesh/CMakeLists.txt
+++ b/src/TKXMesh/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKXMesh)
 
-set (TOOLKIT_MODULES
-  XBRepMesh
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXSBase/CMakeLists.txt b/src/TKXSBase/CMakeLists.txt
index 7dad353ac9..4b8ad112ac 100644
--- a/src/TKXSBase/CMakeLists.txt
+++ b/src/TKXSBase/CMakeLists.txt
@@ -1,22 +1,3 @@
 project(TKXSBase)
 
-set (TOOLKIT_MODULES
-  Interface
-  Transfer
-  IFGraph
-  IFSelect
-  TransferBRep
-  XSControl
-  StepData
-  StepFile
-  HeaderSection
-  RWHeaderSection
-  APIHeaderSection
-  StepSelect
-  UnitsMethods
-  XSAlgo
-  LibCtl
-  MoniTool
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXSDRAW/CMakeLists.txt b/src/TKXSDRAW/CMakeLists.txt
index 003c3e9c5d..193a7bd8a5 100644
--- a/src/TKXSDRAW/CMakeLists.txt
+++ b/src/TKXSDRAW/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKXSDRAW)
 
-set (TOOLKIT_MODULES
-  XSDRAW
-  XSDRAWIGES
-  XSDRAWSTEP
-  XSDRAWSTLVRML
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXml/CMakeLists.txt b/src/TKXml/CMakeLists.txt
index e4ee3ae74f..ed335d3e1d 100644
--- a/src/TKXml/CMakeLists.txt
+++ b/src/TKXml/CMakeLists.txt
@@ -1,10 +1,3 @@
 project(TKXml)
 
-set (TOOLKIT_MODULES
-  XmlDrivers
-  XmlMDataXtd
-  XmlMNaming
-  XmlMPrsStd
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXmlL/CMakeLists.txt b/src/TKXmlL/CMakeLists.txt
index e5e4ddce73..f165e8db96 100644
--- a/src/TKXmlL/CMakeLists.txt
+++ b/src/TKXmlL/CMakeLists.txt
@@ -1,12 +1,3 @@
 project(TKXmlL)
 
-set (TOOLKIT_MODULES
-  XmlLDrivers
-  XmlMDF
-  XmlMDataStd
-  XmlMDocStd
-  XmlMFunction
-  XmlObjMgt
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXmlTObj/CMakeLists.txt b/src/TKXmlTObj/CMakeLists.txt
index 914bf034f9..7f84ae1e8b 100644
--- a/src/TKXmlTObj/CMakeLists.txt
+++ b/src/TKXmlTObj/CMakeLists.txt
@@ -1,7 +1,3 @@
 project(TKXmlTObj)
 
-set (TOOLKIT_MODULES
-  XmlTObjDrivers
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKXmlXCAF/CMakeLists.txt b/src/TKXmlXCAF/CMakeLists.txt
index 3f59fdcf79..dad79ed34a 100644
--- a/src/TKXmlXCAF/CMakeLists.txt
+++ b/src/TKXmlXCAF/CMakeLists.txt
@@ -1,8 +1,3 @@
 project(TKXmlXCAF)
 
-set (TOOLKIT_MODULES
-  XmlXCAFDrivers
-  XmlMXCAFDoc
-)
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKernel/CMakeLists.txt b/src/TKernel/CMakeLists.txt
index 0cd1aa0c47..aa2ddb052d 100644
--- a/src/TKernel/CMakeLists.txt
+++ b/src/TKernel/CMakeLists.txt
@@ -1,38 +1,3 @@
 project(TKernel)
 
-set (TOOLKIT_MODULES
-  FSD
-  MMgt
-  OSD
-  Plugin
-  Quantity
-  Resource
-  Standard
-  StdFail
-  Storage
-  TColStd
-  TCollection
-  TShort
-  Units
-  UnitsAPI
-  Dico
-  NCollection
-  Message
-)
-
-if (WIN32)
-  list( APPEND USED_LIBS advapi32.lib )
-  list( APPEND USED_LIBS gdi32.lib )
-  list( APPEND USED_LIBS user32.lib )
-  list( APPEND USED_LIBS kernel32.lib )
-elseif (NOT APPLE AND NOT ANDROID AND NOT QNX)
-  list( APPEND USED_LIBS pthread )
-  list( APPEND USED_LIBS rt )
-endif()
-
-if(USE_TBB)
-  list( APPEND USED_LIBS tbb )
-  list( APPEND USED_LIBS tbbmalloc )
-endif()
-
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
diff --git a/src/TKernel/EXTERNLIB b/src/TKernel/EXTERNLIB
index cff6c773ea..53e335534c 100755
--- a/src/TKernel/EXTERNLIB
+++ b/src/TKernel/EXTERNLIB
@@ -1,9 +1,5 @@
-CSF_SOCKETLibs
-CSF_FPELibs
 CSF_ThreadLibs
 CSF_advapi32
 CSF_gdi32
 CSF_user32
-CSF_kernel32
-STLPortLib
 CSF_TBB