Import OCCT 6.8.0

 Remove unneeded folders, they are very large:
   data samples/mfc doc dox

 # Remove useless WOK folders
 rm -rf drv/*/.adm

 # Fix permissions (on Unix):
 find * -type f -exec chmod a-x {} \;

 # Autotools scripts
 chmod a+x build_configure

 # Windows scripts
 find adm/msvc  -type f -exec chmod a+x {} \;

 # Shell and bat scripts
 chmod a+x \
    adm/templates/draw.sh  \
    adm/templates/draw.bat  \
    adm/templates/env.sh.in  \
    adm/templates/env.bat.in  \
    adm/templates/sample.bat  \
    codeblocks.sh  \
    custom.bat  \
    custom.sh.in  \
    draw.bat  \
    draw.sh  \
    env.bat  \
    env.sh  \
    gendoc.bat  \
    gendoc  \
    msvc.bat  \
    xcode.sh

Author: dbarbier

BUILD.Windows

@@ -0,0 +1,25 @@
+                 Building Open CASCADE Technology on Windows
+                 -------------------------------------------
+
+This file describes steps to build OCCT libraries from pre-processed source
+(after WOK extraction or from complete source package) on Windows. 
+
+Before building OCCT, you need to install required third-party libraries; see
+OCCT_Build3rdParty_Windows.pdf for details.
+
+1. Edit file custom.bat to define environment: 
+
+   VCVER - version of Visual Studio (vc8, vc9, vc10 or vc11), 
+           and relevant VCVARS path
+   ARCH - architecture (32 or 64)
+   HAVE_* - flags to enable or disable use of optional third-party products
+   CSF_OPT_* - paths to search for includes and binaries of all used 
+               third-party products
+
+2. Launch msvc.bat to start Visual Studio
+
+3. Build with Visual Studio
+
+Use draw.bat to start DRAW
+
+

CMakeLists.txt

@@ -41,6 +41,7 @@ if (APPLE)
 endif()
 
 set (USE_FREEIMAGE OFF CACHE BOOL "Is freeimage used or not")
+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")
@@ -106,12 +107,6 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_TK_LIBRARY_DIR")
 endif()
 
-# GLX
-if (USE_GLX)
-  add_definitions (-DMACOSX_USE_GLX)
-  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/glx")
-endif()
-
 # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
 OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)
 
@@ -126,10 +121,21 @@ else()
   OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_LIBRARY_DIR")
 endif()
 
+# VTK
+if (USE_VTK)
+  add_definitions (-DHAVE_VTK)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/vtk")
+endif()
+
+# GLX
+if (USE_GLX)
+  add_definitions (-DMACOSX_USE_GLX)
+  OCCT_INCLUDE_CMAKE_FILE ("adm/templates/glx")
+endif()
+
 # FREEIMAGE
 if (USE_FREEIMAGE)
   add_definitions (-DHAVE_FREEIMAGE)
-  message (STATUS "Info: freeimage is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimage")
   OCCT_INCLUDE_CMAKE_FILE ("adm/templates/freeimageplus")
 else()
@@ -142,7 +148,6 @@ endif()
 # GL2PS
 if (USE_GL2PS)
   add_definitions (-DHAVE_GL2PS)
-  message (STATUS "Info: gl2ps is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/templates/gl2ps")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
@@ -152,7 +157,6 @@ endif()
 # OPENCL
 if (USE_OPENCL)
   add_definitions (-DHAVE_OPENCL)
-  message (STATUS "Info: OpenCL is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/templates/opencl")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
@@ -164,7 +168,6 @@ endif()
 # TBB
 if (USE_TBB)
   ADD_DEFINITIONS(-DHAVE_TBB)
-  message (STATUS "Info: tbb is used by OCCT")
   OCCT_INCLUDE_CMAKE_FILE ("adm/templates/tbb")
 else()
   OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")

Makefile.am

@@ -37,7 +37,8 @@ endif
 ModelingAlgorithms:
 	cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) ModelingAlgorithms
 
-Visualization_PKGS = Textures Shaders
+Visualization_PKGS = Textures
+
 if ENABLE_VIS
   Visualization_DIRS = $(Visualization_PKGS)
 else

adm/cmake/DRAWEXE/CMakeLists.txt

@@ -55,6 +55,7 @@ ENDIF()
 
 if (WIN32)
 elseif(APPLE)
+elseif(ANDROID)
 else()
 endif()
 
@@ -83,7 +84,7 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR DEFINED TurnONtheDRAWEXE)
 
  set_property(TARGET DRAWEXE PROPERTY FOLDER Draw)
 
- install( TARGETS DRAWEXE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}" )
+ install( TARGETS DRAWEXE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}" )
 
  set_target_properties( DRAWEXE PROPERTIES COMPILE_FLAGS "${DRAWEXE_PRECOMPILED_DEFS}" )
  include_directories( ${DRAWEXE_COMPILER_DIRECTORIES} )

adm/cmake/FWOSPlugin/CMakeLists.txt

@@ -45,6 +45,7 @@ ENDIF()
 
 if (WIN32)
 elseif(APPLE)
+elseif(ANDROID)
 else()
 endif()
 
@@ -84,13 +85,13 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR DEFINED TurnONtheFWOSPlugin)
  set_property(TARGET FWOSPlugin PROPERTY FOLDER ApplicationFramework)
 
  install( TARGETS FWOSPlugin
-                                 RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}"
-                                 ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}"
-                                 LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}")
+                                 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}/out/bin/Debug/FWOSPlugin.pdb CONFIGURATIONS Debug
-                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}")
+  install( FILES  ${CMAKE_BINARY_DIR}/out/bind/Debug/FWOSPlugin.pdb CONFIGURATIONS Debug
+                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
  endif()
 
 

adm/cmake/PTKernel/CMakeLists.txt

@@ -149,6 +149,7 @@ ENDIF()
 
 if (WIN32)
 elseif(APPLE)
+elseif(ANDROID)
 else()
 endif()
 
@@ -888,13 +889,13 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR DEFINED TurnONthePTKernel)
  set_property(TARGET PTKernel PROPERTY FOLDER ApplicationFramework)
 
  install( TARGETS PTKernel
-                                 RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}"
-                                 ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}"
-                                 LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}")
+                                 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}/out/bin/Debug/PTKernel.pdb CONFIGURATIONS Debug
-                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}")
+  install( FILES  ${CMAKE_BINARY_DIR}/out/bind/Debug/PTKernel.pdb CONFIGURATIONS Debug
+                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
  endif()
 
 

adm/cmake/TKBO/CMakeLists.txt

@@ -127,7 +127,26 @@ ENDIF()
 
 if (WIN32)
 elseif(APPLE)
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbb )
+  endif()
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbbmalloc )
+  endif()
+elseif(ANDROID)
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbb )
+  endif()
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbbmalloc )
+  endif()
 else()
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbb )
+  endif()
+  if(USE_TBB)
+    list( APPEND TKBO_USED_LIBS tbbmalloc )
+  endif()
 endif()
 
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//drv/IntTools/IntTools_Array1OfRange_0.cxx")
@@ -1070,16 +1089,6 @@ endif()
     ENDIF()
   ENDIF()
 
-  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx")
-    list( APPEND TKBO_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx" )
-    SOURCE_GROUP (BOPAlgo FILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx")
-  ELSE()
-    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx")
-      list( APPEND TKBO_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx" )
-      SOURCE_GROUP (BOPAlgo FILES "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_BOP_1.cxx")
-    ENDIF()
-  ENDIF()
-
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Builder.cxx")
     list( APPEND TKBO_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Builder.cxx" )
     SOURCE_GROUP (BOPAlgo FILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Builder.cxx")
@@ -1310,6 +1319,16 @@ endif()
     ENDIF()
   ENDIF()
 
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx")
+    list( APPEND TKBO_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx" )
+    SOURCE_GROUP (BOPAlgo FILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx")
+      list( APPEND TKBO_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx" )
+      SOURCE_GROUP (BOPAlgo FILES "${CMAKE_SOURCE_DIR}//src/BOPAlgo/BOPAlgo_Section.cxx")
+    ENDIF()
+  ENDIF()
+
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_SectionAttribute.cxx")
     list( APPEND TKBO_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_SectionAttribute.cxx" )
     SOURCE_GROUP (BOPAlgo FILES "${BUILD_PATCH_DIR}//src/BOPAlgo/BOPAlgo_SectionAttribute.cxx")
@@ -1486,13 +1505,13 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR DEFINED TurnONtheTKBO)
  set_property(TARGET TKBO PROPERTY FOLDER ModelingAlgorithms)
 
  install( TARGETS TKBO
-                                 RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}"
-                                 ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}"
-                                 LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}")
+                                 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}/out/bin/Debug/TKBO.pdb CONFIGURATIONS Debug
-                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}")
+  install( FILES  ${CMAKE_BINARY_DIR}/out/bind/Debug/TKBO.pdb CONFIGURATIONS Debug
+                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
  endif()
 
 

adm/cmake/TKBRep/CMakeLists.txt

@@ -8,6 +8,7 @@ if (WIN32)
   list( APPEND TKBRep_PRECOMPILED_DEFS "-D__BRepLProp_DLL" )
   list( APPEND TKBRep_PRECOMPILED_DEFS "-D__BRepAdaptor_DLL" )
   list( APPEND TKBRep_PRECOMPILED_DEFS "-D__BRepTools_DLL" )
+  list( APPEND TKBRep_PRECOMPILED_DEFS "-D__BinTools_DLL" )
   string( REGEX REPLACE ";" " " TKBRep_PRECOMPILED_DEFS "${TKBRep_PRECOMPILED_DEFS}")
 endif()
 
@@ -69,6 +70,13 @@ endif()
       list( APPEND TKBRep_COMPILER_DIRECTORIES "${BUILD_PATCH_DIR}/src/BRepTools" )
     ENDIF()
 
+    IF(EXISTS "${BUILD_PATCH_DIR}/drv/BinTools")
+      list( APPEND TKBRep_COMPILER_DIRECTORIES "${BUILD_PATCH_DIR}/drv/BinTools" )
+    ENDIF()
+    IF(EXISTS "${BUILD_PATCH_DIR}/src/BinTools")
+      list( APPEND TKBRep_COMPILER_DIRECTORIES "${BUILD_PATCH_DIR}/src/BinTools" )
+    ENDIF()
+
   ENDIF()
 
   IF(EXISTS "${CMAKE_SOURCE_DIR}/drv/TopoDS")
@@ -120,6 +128,13 @@ endif()
     list( APPEND TKBRep_COMPILER_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/BRepTools" )
   ENDIF()
 
+  IF(EXISTS "${CMAKE_SOURCE_DIR}/drv/BinTools")
+    list( APPEND TKBRep_COMPILER_DIRECTORIES "${CMAKE_SOURCE_DIR}/drv/BinTools" )
+  ENDIF()
+  IF(EXISTS "${CMAKE_SOURCE_DIR}/src/BinTools")
+    list( APPEND TKBRep_COMPILER_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/BinTools" )
+  ENDIF()
+
 IF (WIN32)
   IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "")
   ENDIF()
@@ -138,6 +153,7 @@ ENDIF()
 
 if (WIN32)
 elseif(APPLE)
+elseif(ANDROID)
 else()
 endif()
 
@@ -1651,6 +1667,66 @@ endif()
     ENDIF()
   ENDIF()
 
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools.cxx")
+    ENDIF()
+  ENDIF()
+
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools_Curve2dSet.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_Curve2dSet.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_Curve2dSet.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_Curve2dSet.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_Curve2dSet.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_Curve2dSet.cxx")
+    ENDIF()
+  ENDIF()
+
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools_CurveSet.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_CurveSet.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_CurveSet.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_CurveSet.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_CurveSet.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_CurveSet.cxx")
+    ENDIF()
+  ENDIF()
+
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools_LocationSet.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_LocationSet.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_LocationSet.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_LocationSet.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_LocationSet.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_LocationSet.cxx")
+    ENDIF()
+  ENDIF()
+
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools_ShapeSet.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_ShapeSet.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_ShapeSet.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_ShapeSet.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_ShapeSet.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_ShapeSet.cxx")
+    ENDIF()
+  ENDIF()
+
+  IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}//src/BinTools/BinTools_SurfaceSet.cxx")
+    list( APPEND TKBRep_USED_SRCFILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_SurfaceSet.cxx" )
+    SOURCE_GROUP (BinTools FILES "${BUILD_PATCH_DIR}//src/BinTools/BinTools_SurfaceSet.cxx")
+  ELSE()
+    IF(EXISTS "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_SurfaceSet.cxx")
+      list( APPEND TKBRep_USED_SRCFILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_SurfaceSet.cxx" )
+      SOURCE_GROUP (BinTools FILES "${CMAKE_SOURCE_DIR}//src/BinTools/BinTools_SurfaceSet.cxx")
+    ENDIF()
+  ENDIF()
+
 
 IF (WIN32)
 ELSE()
@@ -1667,13 +1743,13 @@ if ("${USED_TOOLKITS}" STREQUAL "" OR DEFINED TurnONtheTKBRep)
  set_property(TARGET TKBRep PROPERTY FOLDER ModelingData)
 
  install( TARGETS TKBRep
-                                 RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}"
-                                 ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}"
-                                 LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BUILD_SUFFIX}")
+                                 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}/out/bin/Debug/TKBRep.pdb CONFIGURATIONS Debug
-                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_SUFFIX}")
+  install( FILES  ${CMAKE_BINARY_DIR}/out/bind/Debug/TKBRep.pdb CONFIGURATIONS Debug
+                                  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BUILD_POSTFIX}")
  endif()