diff --git a/src/3rdParty/Pivy-0.5/CMakeLists.txt b/src/3rdParty/Pivy-0.5/CMakeLists.txt
index 9ddddb3bf..82dd880f1 100644
--- a/src/3rdParty/Pivy-0.5/CMakeLists.txt
+++ b/src/3rdParty/Pivy-0.5/CMakeLists.txt
@@ -40,7 +40,7 @@ add_library(coin SHARED ${CoinPy_SRCS})
 
 target_link_libraries(coin ${CoinPy_LIBS})
 
-SET_BIN_DIR(coin "_coin" "/bin/pivy")
+SET_BIN_DIR(coin _coin /bin/pivy)
 if(WIN32)
     set_target_properties(coin PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
@@ -84,7 +84,7 @@ add_library(soqt SHARED ${SoQtPy_SRCS})
 
 target_link_libraries(soqt ${SoQtPy_LIBS})
 
-SET_BIN_DIR(soqt "_soqt" "/bin/pivy/gui")
+SET_BIN_DIR(soqt _soqt /bin/pivy/gui)
 if(WIN32)
     set_target_properties(soqt PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/3rdParty/Pivy/CMakeLists.txt b/src/3rdParty/Pivy/CMakeLists.txt
index cb458fd76..f429b24fe 100644
--- a/src/3rdParty/Pivy/CMakeLists.txt
+++ b/src/3rdParty/Pivy/CMakeLists.txt
@@ -40,7 +40,7 @@ add_library(coin SHARED ${CoinPy_SRCS})
 
 target_link_libraries(coin ${CoinPy_LIBS})
 
-SET_BIN_DIR(coin "_coin" "/bin/pivy")
+SET_BIN_DIR(coin _coin /bin/pivy)
 if(WIN32)
     set_target_properties(coin PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
@@ -84,7 +84,7 @@ add_library(soqt SHARED ${SoQtPy_SRCS})
 
 target_link_libraries(soqt ${SoQtPy_LIBS})
 
-SET_BIN_DIR(soqt "_soqt" "/bin/pivy/gui")
+SET_BIN_DIR(soqt _soqt /bin/pivy/gui)
 if(WIN32)
     set_target_properties(soqt PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index cf10ad0bc..1645cc17a 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -30,7 +30,7 @@ fc_target_copy_resource(Assembly
     ${CMAKE_BINARY_DIR}/Mod/Assembly
     Init.py)
 
-SET_BIN_DIR(Assembly "Assembly" "/Mod/Assembly")
+SET_BIN_DIR(Assembly Assembly /Mod/Assembly)
 if(WIN32)
     set_target_properties(Assembly PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt
index 270e9f438..45407e7bb 100644
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -40,7 +40,7 @@ fc_target_copy_resource(AssemblyGui
     ${CMAKE_BINARY_DIR}/Mod/Assembly
     InitGui.py)
 
-SET_BIN_DIR(AssemblyGui "AssemblyGui" "/Mod/Assembly")
+SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly)
 if(WIN32)
     set_target_properties(AssemblyGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Cam/App/CMakeLists.txt b/src/Mod/Cam/App/CMakeLists.txt
index 6d2536881..cc484753f 100644
--- a/src/Mod/Cam/App/CMakeLists.txt
+++ b/src/Mod/Cam/App/CMakeLists.txt
@@ -94,7 +94,7 @@ fc_target_copy_resource(Cam
     ${CMAKE_BINARY_DIR}/Mod/Cam
     Init.py)
 
-SET_BIN_DIR(Cam "Cam" "/Mod/Cam")
+SET_BIN_DIR(Cam Cam /Mod/Cam)
 if(WIN32)
     set_target_properties(Cam PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Cam/Gui/CMakeLists.txt b/src/Mod/Cam/Gui/CMakeLists.txt
index e2a79aec4..1c72e64a2 100644
--- a/src/Mod/Cam/Gui/CMakeLists.txt
+++ b/src/Mod/Cam/Gui/CMakeLists.txt
@@ -71,7 +71,7 @@ fc_target_copy_resource(CamGui
     ${CMAKE_BINARY_DIR}/Mod/Cam
     InitGui.py)
 
-SET_BIN_DIR(CamGui "CamGui" "/Mod/Cam")
+SET_BIN_DIR(CamGui CamGui /Mod/Cam)
 if(WIN32)
     set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Complete/App/CMakeLists.txt b/src/Mod/Complete/App/CMakeLists.txt
index ce6ce3258..141c31da3 100644
--- a/src/Mod/Complete/App/CMakeLists.txt
+++ b/src/Mod/Complete/App/CMakeLists.txt
@@ -30,7 +30,7 @@ fc_target_copy_resource(Complete
     ${CMAKE_BINARY_DIR}/Mod/Complete
     Init.py)
 
-SET_BIN_DIR(Complete "Complete" "/Mod/Complete")
+SET_BIN_DIR(Complete Complete /Mod/Complete)
 if(WIN32)
     set_target_properties(Complete PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt
index dbcc8b09b..800b0229e 100644
--- a/src/Mod/Complete/Gui/CMakeLists.txt
+++ b/src/Mod/Complete/Gui/CMakeLists.txt
@@ -36,7 +36,7 @@ fc_target_copy_resource(CompleteGui
     ${CMAKE_BINARY_DIR}/Mod/Complete
     InitGui.py)
 
-SET_BIN_DIR(CompleteGui "CompleteGui" "/Mod/Complete")
+SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete)
 if(WIN32)
     set_target_properties(CompleteGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt
index e7cdae44f..577af8e23 100644
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -85,7 +85,7 @@ fc_target_copy_resource(Drawing
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing
     ${Drawing_Templates})
 
-SET_BIN_DIR(Drawing "Drawing" "/Mod/Drawing")
+SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
 if(WIN32)
     set_target_properties(Drawing PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
index 3283efae1..e35a904b5 100644
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -95,7 +95,7 @@ fc_target_copy_resource(DrawingGui
     ${CMAKE_BINARY_DIR}/Mod/Drawing
     InitGui.py)
 
-SET_BIN_DIR(DrawingGui "DrawingGui" "/Mod/Drawing")
+SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing)
 if(WIN32)
     set_target_properties(DrawingGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index f4c24c5d1..1db91ddf6 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -155,7 +155,7 @@ fc_target_copy_resource(Fem
     ${FemScripts_SRCS}
     )
 
-SET_BIN_DIR(Fem "Fem" "/Mod/Fem")
+SET_BIN_DIR(Fem Fem /Mod/Fem)
 if(WIN32)
     set_target_properties(Fem PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index c27091248..a4c5354aa 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -204,7 +204,7 @@ fc_target_copy_resource(FemGui
     MechanicalAnalysis.ui
     )
 
-SET_BIN_DIR(FemGui "FemGui" "/Mod/Fem")
+SET_BIN_DIR(FemGui FemGui /Mod/Fem)
 if(WIN32)
     set_target_properties(FemGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt
index 87add8c8c..46d3f580d 100644
--- a/src/Mod/Image/App/CMakeLists.txt
+++ b/src/Mod/Image/App/CMakeLists.txt
@@ -37,7 +37,7 @@ fc_target_copy_resource(Image
     ${CMAKE_BINARY_DIR}/Mod/Image
     Init.py)
 
-SET_BIN_DIR(Image "Image" "/Mod/Image")
+SET_BIN_DIR(Image Image /Mod/Image)
 if(WIN32)
     set_target_properties(Image PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt
index 4990749a0..46bc45d91 100644
--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@@ -69,7 +69,7 @@ fc_target_copy_resource(ImageGui
     ${CMAKE_BINARY_DIR}/Mod/Image
     InitGui.py)
 
-SET_BIN_DIR(ImageGui "ImageGui" "/Mod/Image")
+SET_BIN_DIR(ImageGui ImageGui /Mod/Image)
 if(WIN32)
     set_target_properties(ImageGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt
index b3f36ec56..678ac712e 100644
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -69,7 +69,7 @@ fc_target_copy_resource(ImportPy
     ${CMAKE_BINARY_DIR}/Mod/Import
     ${SCL_Resources})
 
-SET_BIN_DIR(Import "Import" "/Mod/Import")
+SET_BIN_DIR(Import Import /Mod/Import)
 if(WIN32)
     set_target_properties(Import PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt
index c4c27ba9a..ea41f72c1 100644
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -46,7 +46,7 @@ fc_target_copy_resource(ImportGui
     ${CMAKE_BINARY_DIR}/Mod/Import
     Init.py InitGui.py)
 
-SET_BIN_DIR(ImportGui "ImportGui" "/Mod/Import")
+SET_BIN_DIR(ImportGui ImportGui /Mod/Import)
 if(WIN32)
     set_target_properties(ImportGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt
index 908e460cd..3fb6a8530 100644
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -42,7 +42,7 @@ fc_target_copy_resource(Inspection
     ${CMAKE_BINARY_DIR}/Mod/Inspection
     Init.py)
 
-SET_BIN_DIR(Inspection "Inspection" "/Mod/Inspection")
+SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
 if(WIN32)
     set_target_properties(Inspection PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt
index 0a7089fee..65fc9eae9 100644
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -59,7 +59,7 @@ fc_target_copy_resource(InspectionGui
     ${CMAKE_BINARY_DIR}/Mod/Inspection
     InitGui.py)
 
-SET_BIN_DIR(InspectionGui "InspectionGui" "/Mod/Inspection")
+SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection)
 if(WIN32)
     set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt
index ed744226e..f3c3c94a3 100644
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -351,7 +351,7 @@ fc_target_copy_resource(Mesh
     ${CMAKE_BINARY_DIR}/Mod/Mesh
     MeshTestsApp.py)
 
-SET_BIN_DIR(Mesh "Mesh" "/Mod/Mesh")
+SET_BIN_DIR(Mesh Mesh /Mod/Mesh)
 if(WIN32)
     set_target_properties(Mesh PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt
index 71efe09e0..c42c301f6 100644
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -129,7 +129,7 @@ fc_target_copy_resource(MeshGui
     ${CMAKE_BINARY_DIR}/Mod/Mesh
     InitGui.py)
 
-SET_BIN_DIR(MeshGui "MeshGui" "/Mod/Mesh")
+SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh)
 if(WIN32)
     set_target_properties(MeshGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index eeed0f40f..98d84ca7f 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -67,7 +67,7 @@ fc_target_copy_resource(MeshPart
     ${CMAKE_BINARY_DIR}/Mod/MeshPart
     Init.py)
 
-SET_BIN_DIR(MeshPart "MeshPart" "/Mod/MeshPart")
+SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart)
 if(WIN32)
     set_target_properties(MeshPart PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index d64e48a88..9843d9602 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -69,7 +69,7 @@ fc_target_copy_resource(MeshPartGui
     ${CMAKE_BINARY_DIR}/Mod/MeshPart
     InitGui.py)
 
-SET_BIN_DIR(MeshPartGui "MeshPartGui" "/Mod/MeshPart")
+SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart)
 if(WIN32)
     set_target_properties(MeshPartGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index c412b0723..e425ca222 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -262,7 +262,7 @@ fc_target_copy_resource(Part
     ${CMAKE_BINARY_DIR}/Mod/Part
     ${Part_Scripts})
 
-SET_BIN_DIR(Part "Part" "/Mod/Part")
+SET_BIN_DIR(Part Part /Mod/Part)
 if(WIN32)
     set_target_properties(Part PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt
index 10f87acfc..4e132ce17 100644
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -230,7 +230,7 @@ fc_target_copy_resource(PartGui
     ${CMAKE_BINARY_DIR}/Mod/Part
     ${PartGui_Scripts})
 
-SET_BIN_DIR(PartGui "PartGui" "/Mod/Part")
+SET_BIN_DIR(PartGui PartGui /Mod/Part)
 if(WIN32)
     set_target_properties(PartGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt
index 37a98ecc9..03ad637fc 100644
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -126,7 +126,7 @@ fc_target_copy_resource(PartDesign
     ${CMAKE_BINARY_DIR}/Mod/PartDesign
     ${PartDesign_Scripts})
 
-SET_BIN_DIR(PartDesign "PartDesign" "/Mod/PartDesign")
+SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign)
 if(WIN32)
     set_target_properties(PartDesign PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt
index f0b7ec34f..98c5ded21 100644
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -188,7 +188,7 @@ fc_target_copy_resource(PartDesignGui
     ${CMAKE_BINARY_DIR}/Mod/PartDesign
     ${PartDesignGui_Scripts})
 
-SET_BIN_DIR(PartDesignGui "PartDesignGui" "/Mod/PartDesign")
+SET_BIN_DIR(PartDesignGui PartDesignGui /Mod/PartDesign)
 if(WIN32)
     set_target_properties(PartDesignGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt
index 5d2ee1180..98d91e7b8 100644
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -50,7 +50,7 @@ fc_target_copy_resource(Points
     ${CMAKE_BINARY_DIR}/Mod/Points
     Init.py)
 
-SET_BIN_DIR(Points "Points" "/Mod/Points")
+SET_BIN_DIR(Points Points /Mod/Points)
 if(WIN32)
     set_target_properties(Points PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt
index 45ec5478c..7d2e24243 100644
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -61,7 +61,7 @@ fc_target_copy_resource(PointsGui
     ${CMAKE_BINARY_DIR}/Mod/Points
     InitGui.py)
 
-SET_BIN_DIR(PointsGui "PointsGui" "/Mod/Points")
+SET_BIN_DIR(PointsGui PointsGui /Mod/Points)
 if(WIN32)
     set_target_properties(PointsGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt
index a1b60aeb7..d1f84b819 100644
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@@ -83,7 +83,7 @@ fc_target_copy_resource(Raytracing
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
     ${Raytracing_Templates})
 
-SET_BIN_DIR(Raytracing "Raytracing" "/Mod/Raytracing")
+SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing)
 if(WIN32)
     set_target_properties(Raytracing PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt
index 45bc5890e..27d2936aa 100644
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -84,7 +84,7 @@ fc_target_copy_resource(RaytracingGui
     ${CMAKE_BINARY_DIR}/Mod/Raytracing
     InitGui.py)
 
-SET_BIN_DIR(RaytracingGui "RaytracingGui" "/Mod/Raytracing")
+SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing)
 if(WIN32)
     set_target_properties(RaytracingGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt
index 36f02662b..72a81433a 100644
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -39,7 +39,7 @@ fc_target_copy_resource(ReverseEngineering
     ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
     Init.py)
 
-SET_BIN_DIR(ReverseEngineering "ReverseEngineering" "/Mod/ReverseEngineering")
+SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
 if(WIN32)
     set_target_properties(ReverseEngineering PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
index 33cd405e4..cc9a22d3f 100644
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -46,7 +46,7 @@ fc_target_copy_resource(ReverseEngineeringGui
     ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
     InitGui.py)
 
-SET_BIN_DIR(ReverseEngineeringGui "ReverseEngineeringGui" "/Mod/ReverseEngineering")
+SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering)
 if(WIN32)
     set_target_properties(ReverseEngineeringGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt
index 91cc768ce..6cab1a41c 100644
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -138,7 +138,7 @@ fc_target_copy_resource(Robot
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot
     ${Robot_Resources})
 
-SET_BIN_DIR(Robot "Robot" "/Mod/Robot")
+SET_BIN_DIR(Robot Robot /Mod/Robot)
 if(WIN32)
     set_target_properties(Robot PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt
index 77ba57a6b..1e6961e9d 100644
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -153,7 +153,7 @@ fc_target_copy_resource(RobotGui
     ${CMAKE_BINARY_DIR}/Mod/Robot
     InitGui.py MovieTool.py)
 
-SET_BIN_DIR(RobotGui "RobotGui" "/Mod/Robot")
+SET_BIN_DIR(RobotGui RobotGui /Mod/Robot)
 if(WIN32)
     set_target_properties(RobotGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt
index 65e2f4896..10b57cf50 100644
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -38,7 +38,7 @@ fc_target_copy_resource(Sandbox
     ${CMAKE_BINARY_DIR}/Mod/Sandbox
     Init.py)
 
-SET_BIN_DIR(Sandbox "Sandbox" "/Mod/Sandbox")
+SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox)
 if(WIN32)
     set_target_properties(Sandbox PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt
index 2dd72346a..6a0d31307 100644
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -49,7 +49,7 @@ fc_target_copy_resource(SandboxGui
     ${CMAKE_BINARY_DIR}/Mod/Sandbox
     InitGui.py)
 
-SET_BIN_DIR(SandboxGui "SandboxGui" "/Mod/Sandbox")
+SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox)
 if(WIN32)
     set_target_properties(SandboxGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt
index 7d9e17db7..629286a90 100644
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -117,7 +117,7 @@ fc_target_copy_resource(Sketcher
     ${CMAKE_BINARY_DIR}/Mod/Sketcher
     ${Sketcher_Scripts})
 
-SET_BIN_DIR(Sketcher "Sketcher" "/Mod/Sketcher")
+SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher)
 if(WIN32)
     set_target_properties(Sketcher PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt
index c7f3f7510..57614fad2 100644
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -114,7 +114,7 @@ fc_target_copy_resource(SketcherGui
     ${CMAKE_BINARY_DIR}/Mod/Sketcher
     ${SketcherGui_Scripts})
 
-SET_BIN_DIR(SketcherGui "SketcherGui" "/Mod/Sketcher")
+SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher)
 if(WIN32)
     set_target_properties(SketcherGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt
index d6fda7e3f..e92a0a19a 100644
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -29,7 +29,7 @@ fc_target_copy_resource(Start
     ${CMAKE_BINARY_DIR}/Mod/Start
     Init.py)
 
-SET_BIN_DIR(Start "Start" "/Mod/Start")
+SET_BIN_DIR(Start Start /Mod/Start)
 if(WIN32)
     set_target_properties(Start PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt
index c789e357c..12877aec5 100644
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -75,7 +75,7 @@ fc_target_copy_resource(StartGui
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start
     ${StartPage_Resources})
 
-SET_BIN_DIR(StartGui "StartGui" "/Mod/Start")
+SET_BIN_DIR(StartGui StartGui /Mod/Start)
 if(WIN32)
     set_target_properties(StartGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt
index 82ef51ab9..e4bfca7b5 100644
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -55,7 +55,7 @@ add_dependencies(QtUnitGui Test)
 
 fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py)
 
-SET_BIN_DIR(QtUnitGui "QtUnitGui" "/Mod/Test")
+SET_BIN_DIR(QtUnitGui QtUnitGui /Mod/Test)
 if(WIN32)
     set_target_properties(QtUnitGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt
index c55e2d184..31b20c7d2 100644
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -46,7 +46,7 @@ fc_target_copy_resource(Web
     ${CMAKE_BINARY_DIR}/Mod/Web
     Init.py)
 
-SET_BIN_DIR(Web "Web" "/Mod/Web")
+SET_BIN_DIR(Web Web /Mod/Web)
 if(WIN32)
     set_target_properties(Web PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt
index d30f5f785..5d46e91fe 100644
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -43,7 +43,7 @@ fc_target_copy_resource(WebGui
     ${CMAKE_BINARY_DIR}/Mod/Web
     Init.py InitGui.py)
 
-SET_BIN_DIR(WebGui "WebGui" "/Mod/Web")
+SET_BIN_DIR(WebGui WebGui /Mod/Web)
 if(WIN32)
     set_target_properties(WebGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
index 667c84ce8..5ade225ea 100644
--- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
@@ -27,7 +27,7 @@ fc_target_copy_resource(_TEMPLATE_
     ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
     Init.py)
 
-SET_BIN_DIR(_TEMPLATE_ "_TEMPLATE_" "/Mod/_TEMPLATE_")
+SET_BIN_DIR(_TEMPLATE_ _TEMPLATE_ /Mod/_TEMPLATE_)
 if(WIN32)
     set_target_properties(_TEMPLATE_ PROPERTIES SUFFIX ".pyd")
 endif(WIN32)
diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
index 733a4dc35..c6138f667 100644
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -37,7 +37,7 @@ fc_target_copy_resource(_TEMPLATE_Gui
     ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
     InitGui.py)
 
-SET_BIN_DIR(_TEMPLATE_Gui "_TEMPLATE_Gui" "/Mod/_TEMPLATE_")
+SET_BIN_DIR(_TEMPLATE_Gui _TEMPLATE_Gui /Mod/_TEMPLATE_)
 if(WIN32)
     set_target_properties(_TEMPLATE_Gui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)