diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
index ab34a2c5c..45f3b2afe 100644
--- a/cMake/UseLibPack8x.cmake
+++ b/cMake/UseLibPack8x.cmake
@@ -58,17 +58,29 @@ set(ZLIB_FOUND TRUE)
 # SMESH
 set(SMESH_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/smesh)
 set(SMESH_LIBRARIES   
- StdMeshers.lib
- MEFISTO2.lib
- SMESH.lib
- DriverUNV.lib
- SMESHDS.lib
- DriverSTL.lib
- DriverDAT.lib
- Driver.lib
- SMDS.lib
+	optimized  StdMeshers.lib
+    optimized  MEFISTO2.lib
+	optimized  SMESH.lib
+	optimized  DriverUNV.lib
+	optimized  SMESHDS.lib
+	optimized  NETGENPlugin.lib
+	optimized  DriverSTL.lib
+	optimized  DriverDAT.lib
+	optimized  Driver.lib
+	optimized  SMDS.lib
  )
-
+set(SMESH_DEBUG_LIBRARIES   
+	debug  StdMeshersd.lib
+	debug  MEFISTO2d.lib
+	debug  SMESHd.lib
+	debug  DriverUNVd.lib
+	debug  SMESHDSd.lib
+	debug  NETGENPlugind.lib
+	debug  DriverSTLd.lib
+	debug  DriverDATd.lib
+	debug  Driverd.lib
+	debug  SMDSd.lib
+) 
 set(SMESH_FOUND TRUE) 
 	
 # Coin3D
@@ -287,37 +299,70 @@ set(OCC_LIBRARY_DIR
     ${FREECAD_LIBPACK_DIR}/lib
 )
 set(OCC_LIBRARIES
-    TKFillet
-    TKMesh
-    TKernel
-    TKG2d
-    TKG3d
-    TKMath
-    TKIGES
-    TKSTL
-    TKShHealing
-    TKXSBase
-    TKBool
-    TKXSBase 
-    TKBO
-    TKBRep
-    TKTopAlgo
-    TKGeomAlgo
-    TKGeomBase
-    TKOffset
-    TKPrim
-    TKSTEP
-    TKSTEPBase
-    TKSTEPAttr
-    TKHLR
-    TKFeat
+    optimized     TKFillet
+    optimized     TKMesh
+    optimized     TKernel
+    optimized     TKG2d
+    optimized     TKG3d
+    optimized     TKMath
+    optimized     TKIGES
+    optimized     TKSTL
+    optimized     TKShHealing
+    optimized     TKXSBase
+    optimized     TKBool 
+    optimized     TKXSBase 
+    optimized     TKBO
+    optimized     TKBRep
+    optimized     TKTopAlgo
+    optimized     TKGeomAlgo
+    optimized     TKGeomBase
+    optimized     TKOffset
+    optimized     TKPrim
+    optimized     TKSTEP
+    optimized     TKSTEPBase
+    optimized     TKSTEPAttr
+    optimized     TKHLR
+    optimized     TKFeat
 )
 set(OCC_OCAF_LIBRARIES
-    TKCAF
-    TKXCAF
-    TKLCAF
-    TKXDESTEP
-    TKXDEIGES
+    optimized     TKCAF
+    optimized     TKXCAF
+    optimized     TKLCAF
+    optimized     TKXDESTEP
+    optimized     TKXDEIGES
+)
+set(OCC_DEBUG_LIBRARIES
+    debug     TKFilletd
+    debug     TKMeshd
+    debug     TKerneld
+    debug     TKG2dd
+    debug     TKG3dd
+    debug     TKMathd
+    debug     TKIGESd
+    debug     TKSTLd
+    debug     TKShHealingd
+    debug     TKXSBased
+    debug     TKBoold
+    debug     TKXSBased 
+    debug     TKBOd
+    debug     TKBRepd
+    debug     TKTopAlgod
+    debug     TKGeomAlgod
+    debug     TKGeomBased
+    debug     TKOffsetd
+    debug     TKPrimd
+    debug     TKSTEPd
+    debug     TKSTEPBased
+    debug     TKSTEPAttrd
+    debug     TKHLRd
+    debug     TKFeatd
+)
+set(OCC_OCAF_DEBUG_LIBRARIES
+    debug     TKCAFd
+    debug     TKXCAFd
+    debug     TKLCAFd
+    debug     TKXDESTEPd
+    debug     TKXDEIGESd
 )
 set(OCC_FOUND TRUE) 
 
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 7bdcdf233..47a42c2d6 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -15,6 +15,7 @@ include_directories(
     ${PYTHON_INCLUDE_PATH}
     ${ZLIB_INCLUDE_DIR}
     ${XERCESC_INCLUDE_DIR}
+    ${SMESH_INCLUDE_DIR} 
 )
 
 link_directories(${OCC_LIBRARY_DIR})
@@ -23,13 +24,10 @@ set(Fem_LIBS
     Part
 	Mesh
     FreeCADApp
+    ${SMESH_LIBRARIES} 
+    ${SMESH_DEBUG_LIBRARIES}
 )
 
-if(SMESH_FOUND)
-    include_directories( ${SMESH_INCLUDE_DIR} )
-    list( APPEND Fem_LIBS ${SMESH_LIBRARIES} )
-endif(SMESH_FOUND)
-
 generate_from_xml(FemMeshPy)
 
 
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 60915adfe..4186a9b9e 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -15,6 +15,7 @@ include_directories(
     ${SOQT_INCLUDE_DIR}
     ${PYTHON_INCLUDE_PATH}
     ${XERCESC_INCLUDE_DIR}
+    ${SMESH_INCLUDE_DIR} 
 )
 
 link_directories(${OCC_LIBRARY_DIR})
@@ -23,11 +24,6 @@ set(FemGui_LIBS
     Fem
     FreeCADGui
 )
-
-if(SMESH_FOUND)
-    include_directories( ${SMESH_INCLUDE_DIR} )
-    list( APPEND FemGui_LIBS ${SMESH_LIBRARIES} )
-endif(SMESH_FOUND)
 
 set(FemGui_MOC_HDRS
     Hypothesis.h
diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
index ed588fd9c..4d2862ec7 100644
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -23,6 +23,7 @@ set(ImportGui_LIBS
     FreeCADGui
     PartGui
     ${OCC_OCAF_LIBRARIES}
+    ${OCC_OCAF_DEBUG_LIBRARIES}
 )
 
 SET(ImportGui_SRCS
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index 078523f1b..3cb408e63 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -28,6 +28,7 @@ set(MeshPart_LIBS
     Part
     Mesh
     ${SMESH_LIBRARIES}
+    ${SMESH_DEBUG_LIBRARIES}
 )
 else(SMESH_FOUND)
 set(MeshPart_LIBS
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index afd21aba2..2f90d6965 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -24,6 +24,7 @@ link_directories(${OCC_LIBRARY_DIR})
 
 set(Part_LIBS 
     ${OCC_LIBRARIES}
+    ${OCC_DEBUG_LIBRARIES}
     ${FREETYPE_LIBRARY}                    
     FreeCADApp
 )
diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt
index 359349364..24e7e2f21 100644
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -16,6 +16,7 @@ link_directories(${OCC_LIBRARY_DIR})
 
 set(PartDesign_LIBS
     ${OCC_LIBRARIES}
+    ${OCC_DEBUG_LIBRARIES}
     Part
     FreeCADApp
 )
diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt
index 359ecd9a2..7fcffceeb 100644
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@@ -19,6 +19,7 @@ link_directories(${OCC_LIBRARY_DIR})
 set(Raytracing_LIBS
     Part
     ${OCC_LIBRARIES}
+    ${OCC_DEBUG_LIBRARIES}
     FreeCADApp
 )