diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index d800cba35..cf10ad0bc 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -30,20 +30,9 @@ fc_target_copy_resource(Assembly
     ${CMAKE_BINARY_DIR}/Mod/Assembly
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Assembly "Assembly" "/Mod/Assembly")
+if(WIN32)
     set_target_properties(Assembly PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Assembly PROPERTIES DEBUG_OUTPUT_NAME "Assembly_d")
-    set_target_properties(Assembly PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(Assembly PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Assembly PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Assembly PROPERTIES DEBUG_OUTPUT_NAME "Assembly_d")
-    set_target_properties(Assembly PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(Assembly PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Assembly PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(Assembly PROPERTIES PREFIX "")
-    SET_TARGET_PROPERTIES(Assembly PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Assembly DESTINATION lib)
diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt
index 9d5daf67d..270e9f438 100644
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -40,20 +40,9 @@ fc_target_copy_resource(AssemblyGui
     ${CMAKE_BINARY_DIR}/Mod/Assembly
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(AssemblyGui "AssemblyGui" "/Mod/Assembly")
+if(WIN32)
     set_target_properties(AssemblyGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(AssemblyGui PROPERTIES DEBUG_OUTPUT_NAME "AssemblyGui_d")
-    set_target_properties(AssemblyGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(AssemblyGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(AssemblyGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(AssemblyGui PROPERTIES DEBUG_OUTPUT_NAME "AssemblyGui_d")
-    set_target_properties(AssemblyGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(AssemblyGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(AssemblyGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Assembly)
-    set_target_properties(AssemblyGui PROPERTIES PREFIX "")
-    SET_TARGET_PROPERTIES(AssemblyGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS AssemblyGui DESTINATION lib)
diff --git a/src/Mod/Cam/App/CMakeLists.txt b/src/Mod/Cam/App/CMakeLists.txt
index 0b4191374..6d2536881 100644
--- a/src/Mod/Cam/App/CMakeLists.txt
+++ b/src/Mod/Cam/App/CMakeLists.txt
@@ -94,20 +94,9 @@ fc_target_copy_resource(Cam
     ${CMAKE_BINARY_DIR}/Mod/Cam
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Cam "Cam" "/Mod/Cam")
+if(WIN32)
     set_target_properties(Cam PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Cam PROPERTIES DEBUG_OUTPUT_NAME "Cam_d")
-    set_target_properties(Cam PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(Cam PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Image PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Image PROPERTIES DEBUG_OUTPUT_NAME "Cam_d")
-    set_target_properties(Image PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(Image PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Cam PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(Cam PROPERTIES PREFIX "")
-    SET_TARGET_PROPERTIES(Cam PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Cam DESTINATION lib)
diff --git a/src/Mod/Cam/Gui/CMakeLists.txt b/src/Mod/Cam/Gui/CMakeLists.txt
index 1d8fa71b8..e2a79aec4 100644
--- a/src/Mod/Cam/Gui/CMakeLists.txt
+++ b/src/Mod/Cam/Gui/CMakeLists.txt
@@ -71,20 +71,9 @@ fc_target_copy_resource(CamGui
     ${CMAKE_BINARY_DIR}/Mod/Cam
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(CamGui "CamGui" "/Mod/Cam")
+if(WIN32)
     set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(CamGui PROPERTIES DEBUG_OUTPUT_NAME "CamGui_d")
-    set_target_properties(CamGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(CamGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(CamGui PROPERTIES DEBUG_OUTPUT_NAME "CamGui_d")
-    set_target_properties(CamGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(CamGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(CamGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Cam)
-    set_target_properties(CamGui PROPERTIES PREFIX "")
-    SET_TARGET_PROPERTIES(CamGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS CamGui DESTINATION lib)
diff --git a/src/Mod/Complete/App/CMakeLists.txt b/src/Mod/Complete/App/CMakeLists.txt
index 5295f92bd..ce6ce3258 100644
--- a/src/Mod/Complete/App/CMakeLists.txt
+++ b/src/Mod/Complete/App/CMakeLists.txt
@@ -30,20 +30,9 @@ fc_target_copy_resource(Complete
     ${CMAKE_BINARY_DIR}/Mod/Complete
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Complete "Complete" "/Mod/Complete")
+if(WIN32)
     set_target_properties(Complete PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Complete PROPERTIES DEBUG_OUTPUT_NAME "Complete_d")
-    set_target_properties(Complete PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(Complete PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Complete PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Complete PROPERTIES DEBUG_OUTPUT_NAME "Complete_d")
-    set_target_properties(Complete PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(Complete PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Complete PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(Complete PROPERTIES PREFIX "")
-    set_target_properties(Complete PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Complete DESTINATION lib)
diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt
index f3bd769cd..dbcc8b09b 100644
--- a/src/Mod/Complete/Gui/CMakeLists.txt
+++ b/src/Mod/Complete/Gui/CMakeLists.txt
@@ -36,20 +36,9 @@ fc_target_copy_resource(CompleteGui
     ${CMAKE_BINARY_DIR}/Mod/Complete
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(CompleteGui "CompleteGui" "/Mod/Complete")
+if(WIN32)
     set_target_properties(CompleteGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(CompleteGui PROPERTIES DEBUG_OUTPUT_NAME "CompleteGui_d")
-    set_target_properties(CompleteGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(CompleteGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(CompleteGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(CompleteGui PROPERTIES DEBUG_OUTPUT_NAME "CompleteGui_d")
-    set_target_properties(CompleteGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(CompleteGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(CompleteGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Complete)
-    set_target_properties(CompleteGui PROPERTIES PREFIX "")
-    set_target_properties(CompleteGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 install(TARGETS CompleteGui DESTINATION lib)
diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt
index 4b6a285ad..e7cdae44f 100644
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -85,23 +85,15 @@ fc_target_copy_resource(Drawing
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing
     ${Drawing_Templates})
 
-if(MSVC)
+SET_BIN_DIR(Drawing "Drawing" "/Mod/Drawing")
+if(WIN32)
     set_target_properties(Drawing PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Drawing PROPERTIES DEBUG_OUTPUT_NAME "Drawing_d")
-    set_target_properties(Drawing PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(Drawing PROPERTIES PREFIX "../")
+endif(WIN32)
+
+if(MSVC)
     # Set special compiler flag to convert a SIGSEV into an exception
     # to fix issue #0000478
     set_target_properties(Drawing PROPERTIES COMPILE_FLAGS "/EHa")
-elseif(MINGW)
-    set_target_properties(Drawing PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Drawing PROPERTIES DEBUG_OUTPUT_NAME "Drawing_d")
-    set_target_properties(Drawing PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(Drawing PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Drawing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(Drawing PROPERTIES PREFIX "")
-    set_target_properties(Drawing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 INSTALL(TARGETS Drawing DESTINATION lib)
diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
index 0cb04658c..3283efae1 100644
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -95,20 +95,9 @@ fc_target_copy_resource(DrawingGui
     ${CMAKE_BINARY_DIR}/Mod/Drawing
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(DrawingGui "DrawingGui" "/Mod/Drawing")
+if(WIN32)
     set_target_properties(DrawingGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(DrawingGui PROPERTIES DEBUG_OUTPUT_NAME "DrawingGui_d")
-    set_target_properties(DrawingGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(DrawingGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(DrawingGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(DrawingGui PROPERTIES DEBUG_OUTPUT_NAME "DrawingGui_d")
-    set_target_properties(DrawingGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(DrawingGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(DrawingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Drawing)
-    set_target_properties(DrawingGui PROPERTIES PREFIX "")
-    set_target_properties(DrawingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS DrawingGui DESTINATION lib)
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index bf0c0f9a0..f4c24c5d1 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -155,21 +155,9 @@ fc_target_copy_resource(Fem
     ${FemScripts_SRCS}
     )
 
-	
-if(MSVC)
+SET_BIN_DIR(Fem "Fem" "/Mod/Fem")
+if(WIN32)
     set_target_properties(Fem PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Fem PROPERTIES DEBUG_OUTPUT_NAME "Fem_d")
-    set_target_properties(Fem PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(Fem PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Fem PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Fem PROPERTIES DEBUG_OUTPUT_NAME "Fem_d")
-    set_target_properties(Fem PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(Fem PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Fem PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(Fem PROPERTIES PREFIX "")
-    set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Fem DESTINATION lib)
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index b6ca94af1..c27091248 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -204,20 +204,9 @@ fc_target_copy_resource(FemGui
     MechanicalAnalysis.ui
     )
 
-if(MSVC)
+SET_BIN_DIR(FemGui "FemGui" "/Mod/Fem")
+if(WIN32)
     set_target_properties(FemGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(FemGui PROPERTIES DEBUG_OUTPUT_NAME "FemGui_d")
-    set_target_properties(FemGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(FemGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(FemGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(FemGui PROPERTIES DEBUG_OUTPUT_NAME "FemGui_d")
-    set_target_properties(FemGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(FemGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(FemGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Fem)
-    set_target_properties(FemGui PROPERTIES PREFIX "")
-    set_target_properties(FemGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS FemGui DESTINATION lib)
diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt
index a029872af..87add8c8c 100644
--- a/src/Mod/Image/App/CMakeLists.txt
+++ b/src/Mod/Image/App/CMakeLists.txt
@@ -37,20 +37,9 @@ fc_target_copy_resource(Image
     ${CMAKE_BINARY_DIR}/Mod/Image
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Image "Image" "/Mod/Image")
+if(WIN32)
     set_target_properties(Image PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Image PROPERTIES DEBUG_OUTPUT_NAME "Image_d")
-    set_target_properties(Image PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(Image PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Image PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Image PROPERTIES DEBUG_OUTPUT_NAME "Image_d")
-    set_target_properties(Image PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(Image PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Image PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(Image PROPERTIES PREFIX "")
-    set_target_properties(Image PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Image DESTINATION lib)
diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt
index 4edb4626f..4990749a0 100644
--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@@ -69,20 +69,9 @@ fc_target_copy_resource(ImageGui
     ${CMAKE_BINARY_DIR}/Mod/Image
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(ImageGui "ImageGui" "/Mod/Image")
+if(WIN32)
     set_target_properties(ImageGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ImageGui PROPERTIES DEBUG_OUTPUT_NAME "ImageGui_d")
-    set_target_properties(ImageGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(ImageGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(ImageGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ImageGui PROPERTIES DEBUG_OUTPUT_NAME "ImageGui_d")
-    set_target_properties(ImageGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(ImageGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(ImageGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Image)
-    set_target_properties(ImageGui PROPERTIES PREFIX "")
-    set_target_properties(ImageGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS ImageGui DESTINATION lib)
diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt
index e8e063aa8..b3f36ec56 100644
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -69,23 +69,14 @@ fc_target_copy_resource(ImportPy
     ${CMAKE_BINARY_DIR}/Mod/Import
     ${SCL_Resources})
 
+SET_BIN_DIR(Import "Import" "/Mod/Import")
+if(WIN32)
+    set_target_properties(Import PROPERTIES SUFFIX ".pyd")
+endif(WIN32)
 
 if(MSVC)
-    set_target_properties(Import PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Import PROPERTIES DEBUG_OUTPUT_NAME "Import_d")
-    set_target_properties(Import PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(Import PROPERTIES PREFIX "../")
     # Set special compiler flag to convert a SIGSEV into an exception
     set_target_properties(Import PROPERTIES COMPILE_FLAGS "/EHa")
-elseif(MINGW)
-    set_target_properties(Import PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Import PROPERTIES DEBUG_OUTPUT_NAME "Import_d")
-    set_target_properties(Import PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(Import PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Import PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(Import PROPERTIES PREFIX "")
-    set_target_properties(Import PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 INSTALL(TARGETS Import DESTINATION lib)
diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
index 412682401..c4c27ba9a 100644
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -46,22 +46,14 @@ fc_target_copy_resource(ImportGui
     ${CMAKE_BINARY_DIR}/Mod/Import
     Init.py InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(ImportGui "ImportGui" "/Mod/Import")
+if(WIN32)
     set_target_properties(ImportGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ImportGui PROPERTIES DEBUG_OUTPUT_NAME "ImportGui_d")
-    set_target_properties(ImportGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(ImportGui PROPERTIES PREFIX "../")
+endif(WIN32)
+
+if(MSVC)
     # Set special compiler flag to convert a SIGSEV into an exception
     set_target_properties(ImportGui PROPERTIES COMPILE_FLAGS "/EHa")
-elseif(MINGW)
-    set_target_properties(ImportGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ImportGui PROPERTIES DEBUG_OUTPUT_NAME "ImportGui_d")
-    set_target_properties(ImportGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(ImportGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(ImportGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Import)
-    set_target_properties(ImportGui PROPERTIES PREFIX "")
-    set_target_properties(ImportGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 INSTALL(TARGETS ImportGui DESTINATION lib)
diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt
index 37116678b..908e460cd 100644
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -41,21 +41,10 @@ fc_target_copy_resource(Inspection
     ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
     ${CMAKE_BINARY_DIR}/Mod/Inspection
     Init.py)
-
-if(MSVC)
-    set_target_properties(Inspection PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Inspection PROPERTIES DEBUG_OUTPUT_NAME "Inspection_d")
-    set_target_properties(Inspection PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(Inspection PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Inspection PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Inspection PROPERTIES DEBUG_OUTPUT_NAME "Inspection_d")
-    set_target_properties(Inspection PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(Inspection PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Inspection PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(Inspection PROPERTIES PREFIX "")
-    set_target_properties(Inspection PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+
+SET_BIN_DIR(Inspection "Inspection" "/Mod/Inspection")
+if(WIN32)
+    set_target_properties(Inspection PROPERTIES SUFFIX ".pyd")
+endif(WIN32)
 
 INSTALL(TARGETS Inspection DESTINATION lib)
diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt
index b059194e3..0a7089fee 100644
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -58,21 +58,10 @@ fc_target_copy_resource(InspectionGui
     ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
     ${CMAKE_BINARY_DIR}/Mod/Inspection
     InitGui.py)
-
-if(MSVC)
-    set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
-    set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(InspectionGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
-    set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(InspectionGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
-    set_target_properties(InspectionGui PROPERTIES PREFIX "")
-    set_target_properties(InspectionGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+
+SET_BIN_DIR(InspectionGui "InspectionGui" "/Mod/Inspection")
+if(WIN32)
+    set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
+endif(WIN32)
 
 INSTALL(TARGETS InspectionGui DESTINATION lib)
diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt
index cd3aaa070..ed744226e 100644
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -351,20 +351,9 @@ fc_target_copy_resource(Mesh
     ${CMAKE_BINARY_DIR}/Mod/Mesh
     MeshTestsApp.py)
 
-if(MSVC)
+SET_BIN_DIR(Mesh "Mesh" "/Mod/Mesh")
+if(WIN32)
     set_target_properties(Mesh PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Mesh PROPERTIES DEBUG_OUTPUT_NAME "Mesh_d")
-    set_target_properties(Mesh PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(Mesh PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Mesh PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Mesh PROPERTIES DEBUG_OUTPUT_NAME "Mesh_d")
-    set_target_properties(Mesh PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(Mesh PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Mesh PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(Mesh PROPERTIES PREFIX "")
-    set_target_properties(Mesh PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Mesh DESTINATION lib)
diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
index 9ef1dae9e..71efe09e0 100644
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -129,20 +129,9 @@ fc_target_copy_resource(MeshGui
     ${CMAKE_BINARY_DIR}/Mod/Mesh
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(MeshGui "MeshGui" "/Mod/Mesh")
+if(WIN32)
     set_target_properties(MeshGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshGui PROPERTIES DEBUG_OUTPUT_NAME "MeshGui_d")
-    set_target_properties(MeshGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(MeshGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(MeshGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshGui PROPERTIES DEBUG_OUTPUT_NAME "MeshGui_d")
-    set_target_properties(MeshGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(MeshGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(MeshGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Mesh)
-    set_target_properties(MeshGui PROPERTIES PREFIX "")
-    set_target_properties(MeshGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS MeshGui DESTINATION lib)
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index df2959e99..eeed0f40f 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -67,20 +67,9 @@ fc_target_copy_resource(MeshPart
     ${CMAKE_BINARY_DIR}/Mod/MeshPart
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(MeshPart "MeshPart" "/Mod/MeshPart")
+if(WIN32)
     set_target_properties(MeshPart PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshPart PROPERTIES DEBUG_OUTPUT_NAME "MeshPart_d")
-    set_target_properties(MeshPart PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPart PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(MeshPart PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshPart PROPERTIES DEBUG_OUTPUT_NAME "MeshPart_d")
-    set_target_properties(MeshPart PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPart PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(MeshPart PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPart PROPERTIES PREFIX "")
-    set_target_properties(MeshPart PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS MeshPart DESTINATION lib)
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index 08766866d..d64e48a88 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -69,20 +69,9 @@ fc_target_copy_resource(MeshPartGui
     ${CMAKE_BINARY_DIR}/Mod/MeshPart
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(MeshPartGui "MeshPartGui" "/Mod/MeshPart")
+if(WIN32)
     set_target_properties(MeshPartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshPartGui PROPERTIES DEBUG_OUTPUT_NAME "MeshPartGui_d")
-    set_target_properties(MeshPartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPartGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(MeshPartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(MeshPartGui PROPERTIES DEBUG_OUTPUT_NAME "MeshPartGui_d")
-    set_target_properties(MeshPartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPartGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(MeshPartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/MeshPart)
-    set_target_properties(MeshPartGui PROPERTIES PREFIX "")
-    set_target_properties(MeshPartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS MeshPartGui DESTINATION lib)
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index fa8c86e12..c412b0723 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -262,23 +262,15 @@ fc_target_copy_resource(Part
     ${CMAKE_BINARY_DIR}/Mod/Part
     ${Part_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(Part "Part" "/Mod/Part")
+if(WIN32)
     set_target_properties(Part PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Part PROPERTIES DEBUG_OUTPUT_NAME "Part_d")
-    set_target_properties(Part PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(Part PROPERTIES PREFIX "../")
+endif(WIN32)
+
+if(MSVC)
     # Set special compiler flag to convert a SIGSEV into an exception
     # to fix issue #0000215, #0001155, ...
     set_target_properties(Part PROPERTIES COMPILE_FLAGS "/EHa")
-elseif(MINGW)
-    set_target_properties(Part PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Part PROPERTIES DEBUG_OUTPUT_NAME "Part_d")
-    set_target_properties(Part PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(Part PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Part PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(Part PROPERTIES PREFIX "")
-    set_target_properties(Part PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 INSTALL(TARGETS Part DESTINATION lib)
diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
index 245e005d8..10f87acfc 100644
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -230,20 +230,9 @@ fc_target_copy_resource(PartGui
     ${CMAKE_BINARY_DIR}/Mod/Part
     ${PartGui_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(PartGui "PartGui" "/Mod/Part")
+if(WIN32)
     set_target_properties(PartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartGui PROPERTIES DEBUG_OUTPUT_NAME "PartGui_d")
-    set_target_properties(PartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(PartGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(PartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartGui PROPERTIES DEBUG_OUTPUT_NAME "PartGui_d")
-    set_target_properties(PartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(PartGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(PartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Part)
-    set_target_properties(PartGui PROPERTIES PREFIX "")
-    set_target_properties(PartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS PartGui DESTINATION lib)
diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt
index b6b17ff8b..37a98ecc9 100644
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -126,21 +126,10 @@ fc_target_copy_resource(PartDesign
     ${CMAKE_BINARY_DIR}/Mod/PartDesign
     ${PartDesign_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(PartDesign "PartDesign" "/Mod/PartDesign")
+if(WIN32)
     set_target_properties(PartDesign PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartDesign PROPERTIES DEBUG_OUTPUT_NAME "PartDesign_d")
-    set_target_properties(PartDesign PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesign PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(PartDesign PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartDesign PROPERTIES DEBUG_OUTPUT_NAME "PartDesign_d")
-    set_target_properties(PartDesign PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesign PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesign PROPERTIES PREFIX "")
-    set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
-endif(MSVC)
+endif(WIN32)
 
 # The PartDesign module must go to where the __init__.py file is
 INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)
diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt
index fb88806e6..f0b7ec34f 100644
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -188,21 +188,10 @@ fc_target_copy_resource(PartDesignGui
     ${CMAKE_BINARY_DIR}/Mod/PartDesign
     ${PartDesignGui_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(PartDesignGui "PartDesignGui" "/Mod/PartDesign")
+if(WIN32)
     set_target_properties(PartDesignGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartDesignGui PROPERTIES DEBUG_OUTPUT_NAME "PartDesignGui_d")
-    set_target_properties(PartDesignGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesignGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(PartDesignGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PartDesignGui PROPERTIES DEBUG_OUTPUT_NAME "PartDesignGui_d")
-    set_target_properties(PartDesignGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesignGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
-    set_target_properties(PartDesignGui PROPERTIES PREFIX "")
-    set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
-endif(MSVC)
+endif(WIN32)
 
 # The PartDesign module must go to where the __init__.py file is
 INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)
diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt
index 9cd657f98..5d2ee1180 100644
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -50,20 +50,9 @@ fc_target_copy_resource(Points
     ${CMAKE_BINARY_DIR}/Mod/Points
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Points "Points" "/Mod/Points")
+if(WIN32)
     set_target_properties(Points PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Points PROPERTIES DEBUG_OUTPUT_NAME "Points_d")
-    set_target_properties(Points PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(Points PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Points PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Points PROPERTIES DEBUG_OUTPUT_NAME "Points_d")
-    set_target_properties(Points PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(Points PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Points PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(Points PROPERTIES PREFIX "")
-    set_target_properties(Points PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Points DESTINATION lib)
diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt
index 7e30f0d45..45ec5478c 100644
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -61,20 +61,9 @@ fc_target_copy_resource(PointsGui
     ${CMAKE_BINARY_DIR}/Mod/Points
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(PointsGui "PointsGui" "/Mod/Points")
+if(WIN32)
     set_target_properties(PointsGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PointsGui PROPERTIES DEBUG_OUTPUT_NAME "PointsGui_d")
-    set_target_properties(PointsGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(PointsGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(PointsGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(PointsGui PROPERTIES DEBUG_OUTPUT_NAME "PointsGui_d")
-    set_target_properties(PointsGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(PointsGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(PointsGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Points)
-    set_target_properties(PointsGui PROPERTIES PREFIX "")
-    set_target_properties(PointsGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS PointsGui DESTINATION lib)
diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt
index feaea9a76..a1b60aeb7 100644
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@@ -83,20 +83,9 @@ fc_target_copy_resource(Raytracing
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
     ${Raytracing_Templates})
 
-if(MSVC)
+SET_BIN_DIR(Raytracing "Raytracing" "/Mod/Raytracing")
+if(WIN32)
     set_target_properties(Raytracing PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Raytracing PROPERTIES DEBUG_OUTPUT_NAME "Raytracing_d")
-    set_target_properties(Raytracing PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(Raytracing PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Raytracing PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Raytracing PROPERTIES DEBUG_OUTPUT_NAME "Raytracing_d")
-    set_target_properties(Raytracing PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(Raytracing PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Raytracing PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(Raytracing PROPERTIES PREFIX "")
-    set_target_properties(Raytracing PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Raytracing DESTINATION lib)
diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt
index 1da30c9ae..45bc5890e 100644
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -84,20 +84,9 @@ fc_target_copy_resource(RaytracingGui
     ${CMAKE_BINARY_DIR}/Mod/Raytracing
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(RaytracingGui "RaytracingGui" "/Mod/Raytracing")
+if(WIN32)
     set_target_properties(RaytracingGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(RaytracingGui PROPERTIES DEBUG_OUTPUT_NAME "RaytracingGui_d")
-    set_target_properties(RaytracingGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(RaytracingGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(RaytracingGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(RaytracingGui PROPERTIES DEBUG_OUTPUT_NAME "RaytracingGui_d")
-    set_target_properties(RaytracingGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(RaytracingGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(RaytracingGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Raytracing)
-    set_target_properties(RaytracingGui PROPERTIES PREFIX "")
-    set_target_properties(RaytracingGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS RaytracingGui DESTINATION lib)
diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt
index e62bf7e64..36f02662b 100644
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -39,20 +39,9 @@ fc_target_copy_resource(ReverseEngineering
     ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(ReverseEngineering "ReverseEngineering" "/Mod/ReverseEngineering")
+if(WIN32)
     set_target_properties(ReverseEngineering PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ReverseEngineering PROPERTIES DEBUG_OUTPUT_NAME "ReverseEngineering_d")
-    set_target_properties(ReverseEngineering PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineering PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(ReverseEngineering PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ReverseEngineering PROPERTIES DEBUG_OUTPUT_NAME "ReverseEngineering_d")
-    set_target_properties(ReverseEngineering PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineering PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(ReverseEngineering PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineering PROPERTIES PREFIX "")
-    set_target_properties(ReverseEngineering PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS ReverseEngineering DESTINATION lib)
diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
index 9a775bcbd..33cd405e4 100644
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -46,22 +46,9 @@ fc_target_copy_resource(ReverseEngineeringGui
     ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(ReverseEngineeringGui "ReverseEngineeringGui" "/Mod/ReverseEngineering")
+if(WIN32)
     set_target_properties(ReverseEngineeringGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ReverseEngineeringGui PROPERTIES DEBUG_OUTPUT_NAME "ReverseEngineeringGui_d")
-    set_target_properties(ReverseEngineeringGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(ReverseEngineeringGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(ReverseEngineeringGui PROPERTIES DEBUG_OUTPUT_NAME "ReverseEngineeringGui_d")
-    set_target_properties(ReverseEngineeringGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(ReverseEngineeringGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering)
-    set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "")
-    set_target_properties(ReverseEngineeringGui
-                          PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}
-    )
-endif(MSVC)
+endif(WIN32)
 
 install(TARGETS ReverseEngineeringGui DESTINATION lib)
diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt
index a2a2d12e8..91cc768ce 100644
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -138,21 +138,9 @@ fc_target_copy_resource(Robot
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot
     ${Robot_Resources})
 
-
-if(MSVC)
+SET_BIN_DIR(Robot "Robot" "/Mod/Robot")
+if(WIN32)
     set_target_properties(Robot PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Robot PROPERTIES DEBUG_OUTPUT_NAME "Robot_d")
-    set_target_properties(Robot PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(Robot PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Robot PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Robot PROPERTIES DEBUG_OUTPUT_NAME "Robot_d")
-    set_target_properties(Robot PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(Robot PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Robot PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(Robot PROPERTIES PREFIX "")
-    set_target_properties(Robot PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Robot DESTINATION lib)
diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt
index fd0e29f10..77ba57a6b 100644
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -153,20 +153,9 @@ fc_target_copy_resource(RobotGui
     ${CMAKE_BINARY_DIR}/Mod/Robot
     InitGui.py MovieTool.py)
 
-if(MSVC)
+SET_BIN_DIR(RobotGui "RobotGui" "/Mod/Robot")
+if(WIN32)
     set_target_properties(RobotGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(RobotGui PROPERTIES DEBUG_OUTPUT_NAME "RobotGui_d")
-    set_target_properties(RobotGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(RobotGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(RobotGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(RobotGui PROPERTIES DEBUG_OUTPUT_NAME "RobotGui_d")
-    set_target_properties(RobotGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(RobotGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(RobotGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Robot)
-    set_target_properties(RobotGui PROPERTIES PREFIX "")
-    set_target_properties(RobotGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS RobotGui DESTINATION lib)
diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt
index 48ffe2569..65e2f4896 100644
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -38,20 +38,9 @@ fc_target_copy_resource(Sandbox
     ${CMAKE_BINARY_DIR}/Mod/Sandbox
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Sandbox "Sandbox" "/Mod/Sandbox")
+if(WIN32)
     set_target_properties(Sandbox PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Sandbox PROPERTIES DEBUG_OUTPUT_NAME "Sandbox_d")
-    set_target_properties(Sandbox PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(Sandbox PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Sandbox PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Sandbox PROPERTIES DEBUG_OUTPUT_NAME "Sandbox_d")
-    set_target_properties(Sandbox PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(Sandbox PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Sandbox PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(Sandbox PROPERTIES PREFIX "")
-    set_target_properties(Sandbox PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Sandbox DESTINATION lib)
diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt
index 841e46fc5..2dd72346a 100644
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -49,20 +49,9 @@ fc_target_copy_resource(SandboxGui
     ${CMAKE_BINARY_DIR}/Mod/Sandbox
     InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(SandboxGui "SandboxGui" "/Mod/Sandbox")
+if(WIN32)
     set_target_properties(SandboxGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(SandboxGui PROPERTIES DEBUG_OUTPUT_NAME "SandboxGui_d")
-    set_target_properties(SandboxGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(SandboxGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(SandboxGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(SandboxGui PROPERTIES DEBUG_OUTPUT_NAME "SandboxGui_d")
-    set_target_properties(SandboxGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(SandboxGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(SandboxGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sandbox)
-    set_target_properties(SandboxGui PROPERTIES PREFIX "")
-    set_target_properties(SandboxGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS SandboxGui DESTINATION lib)
diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt
index e6a6ff519..7d9e17db7 100644
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -117,20 +117,9 @@ fc_target_copy_resource(Sketcher
     ${CMAKE_BINARY_DIR}/Mod/Sketcher
     ${Sketcher_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(Sketcher "Sketcher" "/Mod/Sketcher")
+if(WIN32)
     set_target_properties(Sketcher PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Sketcher PROPERTIES DEBUG_OUTPUT_NAME "Sketcher_d")
-    set_target_properties(Sketcher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(Sketcher PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Sketcher PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Sketcher PROPERTIES DEBUG_OUTPUT_NAME "Sketcher_d")
-    set_target_properties(Sketcher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(Sketcher PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Sketcher PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(Sketcher PROPERTIES PREFIX "")
-    set_target_properties(Sketcher PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Sketcher DESTINATION lib)
diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt
index 83950692c..c7f3f7510 100644
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -114,20 +114,9 @@ fc_target_copy_resource(SketcherGui
     ${CMAKE_BINARY_DIR}/Mod/Sketcher
     ${SketcherGui_Scripts})
 
-if(MSVC)
+SET_BIN_DIR(SketcherGui "SketcherGui" "/Mod/Sketcher")
+if(WIN32)
     set_target_properties(SketcherGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(SketcherGui PROPERTIES DEBUG_OUTPUT_NAME "SketcherGui_d")
-    set_target_properties(SketcherGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(SketcherGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(SketcherGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(SketcherGui PROPERTIES DEBUG_OUTPUT_NAME "SketcherGui_d")
-    set_target_properties(SketcherGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(SketcherGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(SketcherGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Sketcher)
-    set_target_properties(SketcherGui PROPERTIES PREFIX "")
-    set_target_properties(SketcherGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS SketcherGui DESTINATION lib)
diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt
index 43a5b3c44..d6fda7e3f 100644
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -29,20 +29,9 @@ fc_target_copy_resource(Start
     ${CMAKE_BINARY_DIR}/Mod/Start
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Start "Start" "/Mod/Start")
+if(WIN32)
     set_target_properties(Start PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Start PROPERTIES DEBUG_OUTPUT_NAME "Start_d")
-    set_target_properties(Start PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(Start PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Start PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Start PROPERTIES DEBUG_OUTPUT_NAME "Start_d")
-    set_target_properties(Start PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(Start PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Start PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(Start PROPERTIES PREFIX "")
-    set_target_properties(Start PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS Start DESTINATION lib)
diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt
index 322752436..c789e357c 100644
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -75,20 +75,9 @@ fc_target_copy_resource(StartGui
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start
     ${StartPage_Resources})
 
-if(MSVC)
+SET_BIN_DIR(StartGui "StartGui" "/Mod/Start")
+if(WIN32)
     set_target_properties(StartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(StartGui PROPERTIES DEBUG_OUTPUT_NAME "StartGui_d")
-    set_target_properties(StartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(StartGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(StartGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(StartGui PROPERTIES DEBUG_OUTPUT_NAME "StartGui_d")
-    set_target_properties(StartGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(StartGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(StartGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Start)
-    set_target_properties(StartGui PROPERTIES PREFIX "")
-    set_target_properties(StartGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS StartGui DESTINATION lib)
diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt
index eaa0dcda2..82ef51ab9 100644
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -55,21 +55,10 @@ add_dependencies(QtUnitGui Test)
 
 fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py)
 
-if(MSVC)
+SET_BIN_DIR(QtUnitGui "QtUnitGui" "/Mod/Test")
+if(WIN32)
     set_target_properties(QtUnitGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(QtUnitGui PROPERTIES DEBUG_OUTPUT_NAME "QtUnitGui_d")
-    set_target_properties(QtUnitGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
-    set_target_properties(QtUnitGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(QtUnitGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(QtUnitGui PROPERTIES DEBUG_OUTPUT_NAME "QtUnitGui_d")
-    set_target_properties(QtUnitGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
-    set_target_properties(QtUnitGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(QtUnitGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Test)
-    set_target_properties(QtUnitGui PROPERTIES PREFIX "")
-    set_target_properties(QtUnitGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS QtUnitGui DESTINATION lib)
 INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test)
diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt
index aaebdde25..c55e2d184 100644
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -46,20 +46,9 @@ fc_target_copy_resource(Web
     ${CMAKE_BINARY_DIR}/Mod/Web
     Init.py)
 
-if(MSVC)
+SET_BIN_DIR(Web "Web" "/Mod/Web")
+if(WIN32)
     set_target_properties(Web PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Web PROPERTIES DEBUG_OUTPUT_NAME "Web_d")
-    set_target_properties(Web PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(Web PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(Web PROPERTIES SUFFIX ".pyd")
-    set_target_properties(Web PROPERTIES DEBUG_OUTPUT_NAME "Web_d")
-    set_target_properties(Web PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(Web PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(Web PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(Web PROPERTIES PREFIX "")
-    set_target_properties(Web PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 install(TARGETS Web DESTINATION lib)
diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt
index 2aa8fcb16..d30f5f785 100644
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -43,20 +43,9 @@ fc_target_copy_resource(WebGui
     ${CMAKE_BINARY_DIR}/Mod/Web
     Init.py InitGui.py)
 
-if(MSVC)
+SET_BIN_DIR(WebGui "WebGui" "/Mod/Web")
+if(WIN32)
     set_target_properties(WebGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(WebGui PROPERTIES DEBUG_OUTPUT_NAME "WebGui_d")
-    set_target_properties(WebGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(WebGui PROPERTIES PREFIX "../")
-elseif(MINGW)
-    set_target_properties(WebGui PROPERTIES SUFFIX ".pyd")
-    set_target_properties(WebGui PROPERTIES DEBUG_OUTPUT_NAME "WebGui_d")
-    set_target_properties(WebGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(WebGui PROPERTIES PREFIX "")
-else(MSVC)
-    set_target_properties(WebGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Web)
-    set_target_properties(WebGui PROPERTIES PREFIX "")
-    set_target_properties(WebGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
-endif(MSVC)
+endif(WIN32)
 
 INSTALL(TARGETS WebGui DESTINATION lib)