diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 9edf31626..9197b2e39 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -230,10 +230,6 @@ MACRO(SET_BIN_DIR ProjectName OutputName) if(WIN32) set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME ${OutputName}_d) else(WIN32) - if(NOT ${ProjectName} MATCHES "^FreeCAD(App|Base|Gui|Main|MainCmd)$") - set_target_properties(${ProjectName} PROPERTIES PREFIX "") - endif(NOT ${ProjectName} MATCHES "^FreeCAD(App|Base|Gui|Main|MainCmd)$") - if(${ARGC} STREQUAL 4) set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3}) else(${ARGC} STREQUAL 4) @@ -241,3 +237,14 @@ MACRO(SET_BIN_DIR ProjectName OutputName) endif(${ARGC} STREQUAL 4) endif(WIN32) ENDMACRO(SET_BIN_DIR) + +# Set python prefix & suffix together +MACRO(SET_PYTHON_PREFIX_SUFFIX ProjectName) + if(NOT MSVC) + set_target_properties(${ProjectName} PROPERTIES PREFIX "") + endif(NOT MSVC) + + if(WIN32) + set_target_properties(${ProjectName} PROPERTIES SUFFIX ".pyd") + endif(WIN32) +ENDMACRO(SET_PYTHON_PREFIX_SUFFIX) diff --git a/src/3rdParty/Pivy-0.5/CMakeLists.txt b/src/3rdParty/Pivy-0.5/CMakeLists.txt index f8658699d..905cc5ada 100644 --- a/src/3rdParty/Pivy-0.5/CMakeLists.txt +++ b/src/3rdParty/Pivy-0.5/CMakeLists.txt @@ -41,10 +41,7 @@ add_library(coin SHARED ${CoinPy_SRCS}) target_link_libraries(coin ${CoinPy_LIBS}) SET_BIN_DIR(coin _coin /bin/pivy) -if(WIN32) - set_target_properties(coin PROPERTIES PREFIX "") - set_target_properties(coin PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(coin) fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy" __init__.py @@ -86,10 +83,7 @@ add_library(soqt SHARED ${SoQtPy_SRCS}) target_link_libraries(soqt ${SoQtPy_LIBS}) SET_BIN_DIR(soqt _soqt /bin/pivy/gui) -if(WIN32) - set_target_properties(soqt PROPERTIES PREFIX "") - set_target_properties(soqt PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(soqt) fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy" gui/soqt.py diff --git a/src/3rdParty/Pivy/CMakeLists.txt b/src/3rdParty/Pivy/CMakeLists.txt index f13291e18..975000c96 100644 --- a/src/3rdParty/Pivy/CMakeLists.txt +++ b/src/3rdParty/Pivy/CMakeLists.txt @@ -41,10 +41,7 @@ add_library(coin SHARED ${CoinPy_SRCS}) target_link_libraries(coin ${CoinPy_LIBS}) SET_BIN_DIR(coin _coin /bin/pivy) -if(WIN32) - set_target_properties(coin PROPERTIES PREFIX "") - set_target_properties(coin PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(coin) fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy" __init__.py @@ -86,10 +83,7 @@ add_library(soqt SHARED ${SoQtPy_SRCS}) target_link_libraries(soqt ${SoQtPy_LIBS}) SET_BIN_DIR(soqt _soqt /bin/pivy/gui) -if(WIN32) - set_target_properties(soqt PROPERTIES PREFIX "") - set_target_properties(soqt PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(soqt) fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy" gui/soqt.py diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index d87028805..7c867df6c 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -95,10 +95,7 @@ add_library(FreeCADMainPy SHARED ${FreeCADMainPy_SRCS}) target_link_libraries(FreeCADMainPy FreeCADApp) SET_BIN_DIR(FreeCADMainPy FreeCAD) -if(WIN32) - set_target_properties(FreeCADMainPy PROPERTIES PREFIX "") - set_target_properties(FreeCADMainPy PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(FreeCADMainPy) if(WIN32) INSTALL(TARGETS FreeCADMainPy @@ -123,10 +120,10 @@ if(FREECAD_BUILD_GUI) target_link_libraries(FreeCADGuiPy FreeCADGui) SET_BIN_DIR(FreeCADGuiPy FreeCADGui) + SET_PYTHON_PREFIX_SUFFIX(FreeCADGuiPy) if(WIN32) - set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") - set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") # Name clash with target "FreeCADGui" + # Must be called "FreeCADGuiPy_d" and "FreeCADGuiPy" to work so override default set_target_properties(FreeCADGuiPy PROPERTIES PDB_NAME_DEBUG "FreeCADGuiPy_d") set_target_properties(FreeCADGuiPy PROPERTIES PDB_NAME_RELEASE "FreeCADGuiPy") endif(WIN32) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index af4992bd4..a4f28dbbf 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -31,9 +31,6 @@ fc_target_copy_resource(Assembly Init.py) SET_BIN_DIR(Assembly Assembly /Mod/Assembly) -if(WIN32) - set_target_properties(Assembly PROPERTIES PREFIX "") - set_target_properties(Assembly PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Assembly) INSTALL(TARGETS Assembly DESTINATION lib) diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index bb49a6cd0..aa0e90504 100644 --- a/src/Mod/Assembly/Gui/CMakeLists.txt +++ b/src/Mod/Assembly/Gui/CMakeLists.txt @@ -41,9 +41,6 @@ fc_target_copy_resource(AssemblyGui InitGui.py) SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly) -if(WIN32) - set_target_properties(AssemblyGui PROPERTIES PREFIX "") - set_target_properties(AssemblyGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(AssemblyGui) INSTALL(TARGETS AssemblyGui DESTINATION lib) diff --git a/src/Mod/Complete/App/CMakeLists.txt b/src/Mod/Complete/App/CMakeLists.txt index 2e3187bc5..474cc51bc 100644 --- a/src/Mod/Complete/App/CMakeLists.txt +++ b/src/Mod/Complete/App/CMakeLists.txt @@ -31,9 +31,6 @@ fc_target_copy_resource(Complete Init.py) SET_BIN_DIR(Complete Complete /Mod/Complete) -if(WIN32) - set_target_properties(Complete PROPERTIES PREFIX "") - set_target_properties(Complete PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Complete) INSTALL(TARGETS Complete DESTINATION lib) diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt index a7ba54dc9..fcf930872 100644 --- a/src/Mod/Complete/Gui/CMakeLists.txt +++ b/src/Mod/Complete/Gui/CMakeLists.txt @@ -37,9 +37,6 @@ fc_target_copy_resource(CompleteGui InitGui.py) SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete) -if(WIN32) - set_target_properties(CompleteGui PROPERTIES PREFIX "") - set_target_properties(CompleteGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(CompleteGui) install(TARGETS CompleteGui DESTINATION lib) diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 66676716d..c11c9b294 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -86,9 +86,6 @@ fc_target_copy_resource(Drawing ${Drawing_Templates}) SET_BIN_DIR(Drawing Drawing /Mod/Drawing) -if(WIN32) - set_target_properties(Drawing PROPERTIES PREFIX "") - set_target_properties(Drawing PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Drawing) INSTALL(TARGETS Drawing DESTINATION lib) diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index b7be6ecce..59cfb4f89 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -96,9 +96,6 @@ fc_target_copy_resource(DrawingGui InitGui.py) SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing) -if(WIN32) - set_target_properties(DrawingGui PROPERTIES PREFIX "") - set_target_properties(DrawingGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(DrawingGui) INSTALL(TARGETS DrawingGui DESTINATION lib) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index fd66c251d..381c3abee 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -156,9 +156,6 @@ fc_target_copy_resource(Fem ) SET_BIN_DIR(Fem Fem /Mod/Fem) -if(WIN32) - set_target_properties(Fem PROPERTIES PREFIX "") - set_target_properties(Fem PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Fem) INSTALL(TARGETS Fem DESTINATION lib) diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 22ae58302..bc47eca3f 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -205,9 +205,6 @@ fc_target_copy_resource(FemGui ) SET_BIN_DIR(FemGui FemGui /Mod/Fem) -if(WIN32) - set_target_properties(FemGui PROPERTIES PREFIX "") - set_target_properties(FemGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(FemGui) INSTALL(TARGETS FemGui DESTINATION lib) diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt index 3e666af29..ba8faa426 100644 --- a/src/Mod/Image/App/CMakeLists.txt +++ b/src/Mod/Image/App/CMakeLists.txt @@ -38,9 +38,6 @@ fc_target_copy_resource(Image Init.py) SET_BIN_DIR(Image Image /Mod/Image) -if(WIN32) - set_target_properties(Image PROPERTIES PREFIX "") - set_target_properties(Image PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Image) INSTALL(TARGETS Image DESTINATION lib) diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index 55339e95a..f455d0d45 100644 --- a/src/Mod/Image/Gui/CMakeLists.txt +++ b/src/Mod/Image/Gui/CMakeLists.txt @@ -70,9 +70,6 @@ fc_target_copy_resource(ImageGui InitGui.py) SET_BIN_DIR(ImageGui ImageGui /Mod/Image) -if(WIN32) - set_target_properties(ImageGui PROPERTIES PREFIX "") - set_target_properties(ImageGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(ImageGui) INSTALL(TARGETS ImageGui DESTINATION lib) diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index b697212fd..ee0ea05a6 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -70,9 +70,6 @@ fc_target_copy_resource(ImportPy ${SCL_Resources}) SET_BIN_DIR(Import Import /Mod/Import) -if(WIN32) - set_target_properties(Import PROPERTIES PREFIX "") - set_target_properties(Import PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Import) INSTALL(TARGETS Import DESTINATION lib) diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index 3bd4a69b5..4cc0d4fa8 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -47,9 +47,6 @@ fc_target_copy_resource(ImportGui Init.py InitGui.py) SET_BIN_DIR(ImportGui ImportGui /Mod/Import) -if(WIN32) - set_target_properties(ImportGui PROPERTIES PREFIX "") - set_target_properties(ImportGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(ImportGui) INSTALL(TARGETS ImportGui DESTINATION lib) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index d69cb2fc7..fafdc2ba2 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -43,9 +43,6 @@ fc_target_copy_resource(Inspection Init.py) SET_BIN_DIR(Inspection Inspection /Mod/Inspection) -if(WIN32) - set_target_properties(Inspection PROPERTIES PREFIX "") - set_target_properties(Inspection PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Inspection) INSTALL(TARGETS Inspection DESTINATION lib) diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index e7cd6d722..162b23cee 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -60,9 +60,6 @@ fc_target_copy_resource(InspectionGui InitGui.py) SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection) -if(WIN32) - set_target_properties(InspectionGui PROPERTIES PREFIX "") - set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(InspectionGui) INSTALL(TARGETS InspectionGui DESTINATION lib) diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index df4e9fd1c..4315c6498 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -352,9 +352,6 @@ fc_target_copy_resource(Mesh MeshTestsApp.py) SET_BIN_DIR(Mesh Mesh /Mod/Mesh) -if(WIN32) - set_target_properties(Mesh PROPERTIES PREFIX "") - set_target_properties(Mesh PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Mesh) INSTALL(TARGETS Mesh DESTINATION lib) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 4fd2ffb73..a7018377f 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -130,9 +130,6 @@ fc_target_copy_resource(MeshGui InitGui.py) SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) -if(WIN32) - set_target_properties(MeshGui PROPERTIES PREFIX "") - set_target_properties(MeshGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(MeshGui) INSTALL(TARGETS MeshGui DESTINATION lib) diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 864797820..a102f4607 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -68,9 +68,6 @@ fc_target_copy_resource(MeshPart Init.py) SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart) -if(WIN32) - set_target_properties(MeshPart PROPERTIES PREFIX "") - set_target_properties(MeshPart PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(MeshPart) INSTALL(TARGETS MeshPart DESTINATION lib) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 45f4b654f..789c9dcbe 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -70,9 +70,6 @@ fc_target_copy_resource(MeshPartGui InitGui.py) SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart) -if(WIN32) - set_target_properties(MeshPartGui PROPERTIES PREFIX "") - set_target_properties(MeshPartGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(MeshPartGui) INSTALL(TARGETS MeshPartGui DESTINATION lib) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index d324416fc..75f4a9329 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -263,9 +263,6 @@ fc_target_copy_resource(Part ${Part_Scripts}) SET_BIN_DIR(Part Part /Mod/Part) -if(WIN32) - set_target_properties(Part PROPERTIES PREFIX "") - set_target_properties(Part PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Part) INSTALL(TARGETS Part DESTINATION lib) diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index ccf660463..34846474f 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -231,9 +231,6 @@ fc_target_copy_resource(PartGui ${PartGui_Scripts}) SET_BIN_DIR(PartGui PartGui /Mod/Part) -if(WIN32) - set_target_properties(PartGui PROPERTIES PREFIX "") - set_target_properties(PartGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(PartGui) INSTALL(TARGETS PartGui DESTINATION lib) diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 5fccf2dff..2d1550957 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -129,10 +129,7 @@ fc_target_copy_resource(PartDesign # See link for why this module is installed differently from the other modules: # http://forum.freecadweb.org/viewtopic.php?f=19&t=5444 SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign /Mod/PartDesign) -if(WIN32) - set_target_properties(PartDesign PROPERTIES PREFIX "") - set_target_properties(PartDesign PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(PartDesign) # 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 c59fc59e2..f4ab775c9 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -191,10 +191,7 @@ fc_target_copy_resource(PartDesignGui # See link for why this module is installed differently from the other modules: # http://forum.freecadweb.org/viewtopic.php?f=19&t=5444 SET_BIN_DIR(PartDesignGui PartDesignGui /Mod/PartDesign /Mod/PartDesign) -if(WIN32) - set_target_properties(PartDesignGui PROPERTIES PREFIX "") - set_target_properties(PartDesignGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(PartDesignGui) # 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 c5a2c489e..9a8991a5a 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -51,9 +51,6 @@ fc_target_copy_resource(Points Init.py) SET_BIN_DIR(Points Points /Mod/Points) -if(WIN32) - set_target_properties(Points PROPERTIES PREFIX "") - set_target_properties(Points PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Points) INSTALL(TARGETS Points DESTINATION lib) diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index d0f64d7cc..9e6a55c05 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -62,9 +62,6 @@ fc_target_copy_resource(PointsGui InitGui.py) SET_BIN_DIR(PointsGui PointsGui /Mod/Points) -if(WIN32) - set_target_properties(PointsGui PROPERTIES PREFIX "") - set_target_properties(PointsGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(PointsGui) INSTALL(TARGETS PointsGui DESTINATION lib) diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt index c92827fda..9b690da75 100644 --- a/src/Mod/Raytracing/App/CMakeLists.txt +++ b/src/Mod/Raytracing/App/CMakeLists.txt @@ -84,9 +84,6 @@ fc_target_copy_resource(Raytracing ${Raytracing_Templates}) SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing) -if(WIN32) - set_target_properties(Raytracing PROPERTIES PREFIX "") - set_target_properties(Raytracing PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Raytracing) INSTALL(TARGETS Raytracing DESTINATION lib) diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt index 783f1234e..2700e7775 100644 --- a/src/Mod/Raytracing/Gui/CMakeLists.txt +++ b/src/Mod/Raytracing/Gui/CMakeLists.txt @@ -85,9 +85,6 @@ fc_target_copy_resource(RaytracingGui InitGui.py) SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing) -if(WIN32) - set_target_properties(RaytracingGui PROPERTIES PREFIX "") - set_target_properties(RaytracingGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(RaytracingGui) INSTALL(TARGETS RaytracingGui DESTINATION lib) diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 7e9ba268f..bd04a57a8 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -40,9 +40,6 @@ fc_target_copy_resource(ReverseEngineering Init.py) SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering) -if(WIN32) - set_target_properties(ReverseEngineering PROPERTIES PREFIX "") - set_target_properties(ReverseEngineering PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering) INSTALL(TARGETS ReverseEngineering DESTINATION lib) diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 849dec116..4e6465ee5 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -47,9 +47,6 @@ fc_target_copy_resource(ReverseEngineeringGui InitGui.py) SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering) -if(WIN32) - set_target_properties(ReverseEngineeringGui PROPERTIES PREFIX "") - set_target_properties(ReverseEngineeringGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui) install(TARGETS ReverseEngineeringGui DESTINATION lib) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 104a7ec0d..6a893cc0a 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -139,9 +139,6 @@ fc_target_copy_resource(Robot ${Robot_Resources}) SET_BIN_DIR(Robot Robot /Mod/Robot) -if(WIN32) - set_target_properties(Robot PROPERTIES PREFIX "") - set_target_properties(Robot PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Robot) INSTALL(TARGETS Robot DESTINATION lib) diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index b2b7e55e9..b9ba53865 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -154,9 +154,6 @@ fc_target_copy_resource(RobotGui InitGui.py MovieTool.py) SET_BIN_DIR(RobotGui RobotGui /Mod/Robot) -if(WIN32) - set_target_properties(RobotGui PROPERTIES PREFIX "") - set_target_properties(RobotGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(RobotGui) INSTALL(TARGETS RobotGui DESTINATION lib) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 90f58dec2..7add1bf0c 100644 --- a/src/Mod/Sandbox/App/CMakeLists.txt +++ b/src/Mod/Sandbox/App/CMakeLists.txt @@ -39,9 +39,6 @@ fc_target_copy_resource(Sandbox Init.py) SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox) -if(WIN32) - set_target_properties(Sandbox PROPERTIES PREFIX "") - set_target_properties(Sandbox PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Sandbox) INSTALL(TARGETS Sandbox DESTINATION lib) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index fe04cd9ef..a7a43f2c9 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -50,9 +50,6 @@ fc_target_copy_resource(SandboxGui InitGui.py) SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox) -if(WIN32) - set_target_properties(SandboxGui PROPERTIES PREFIX "") - set_target_properties(SandboxGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(SandboxGui) INSTALL(TARGETS SandboxGui DESTINATION lib) diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index 469f41db4..f06cad59c 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -118,9 +118,6 @@ fc_target_copy_resource(Sketcher ${Sketcher_Scripts}) SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher) -if(WIN32) - set_target_properties(Sketcher PROPERTIES PREFIX "") - set_target_properties(Sketcher PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Sketcher) INSTALL(TARGETS Sketcher DESTINATION lib) diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index bbc8d46a5..c3f261939 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -115,9 +115,6 @@ fc_target_copy_resource(SketcherGui ${SketcherGui_Scripts}) SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher) -if(WIN32) - set_target_properties(SketcherGui PROPERTIES PREFIX "") - set_target_properties(SketcherGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(SketcherGui) INSTALL(TARGETS SketcherGui DESTINATION lib) diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index 281dc80b1..b5c92c820 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -30,9 +30,6 @@ fc_target_copy_resource(Start Init.py) SET_BIN_DIR(Start Start /Mod/Start) -if(WIN32) - set_target_properties(Start PROPERTIES PREFIX "") - set_target_properties(Start PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Start) INSTALL(TARGETS Start DESTINATION lib) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 13eea8c9c..c05bed84e 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -76,9 +76,6 @@ fc_target_copy_resource(StartGui ${StartPage_Resources}) SET_BIN_DIR(StartGui StartGui /Mod/Start) -if(WIN32) - set_target_properties(StartGui PROPERTIES PREFIX "") - set_target_properties(StartGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(StartGui) INSTALL(TARGETS StartGui DESTINATION lib) diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 35427c631..ed75439c0 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -56,10 +56,7 @@ add_dependencies(QtUnitGui Test) fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py) SET_BIN_DIR(QtUnitGui QtUnitGui /Mod/Test) -if(WIN32) - set_target_properties(QtUnitGui PROPERTIES PREFIX "") - set_target_properties(QtUnitGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(QtUnitGui) 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 eb5285aab..25ad98ed7 100644 --- a/src/Mod/Web/App/CMakeLists.txt +++ b/src/Mod/Web/App/CMakeLists.txt @@ -47,9 +47,6 @@ fc_target_copy_resource(Web Init.py) SET_BIN_DIR(Web Web /Mod/Web) -if(WIN32) - set_target_properties(Web PROPERTIES PREFIX "") - set_target_properties(Web PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(Web) install(TARGETS Web DESTINATION lib) diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index 84fd7cc24..e4a67bf97 100644 --- a/src/Mod/Web/Gui/CMakeLists.txt +++ b/src/Mod/Web/Gui/CMakeLists.txt @@ -44,9 +44,6 @@ fc_target_copy_resource(WebGui Init.py InitGui.py) SET_BIN_DIR(WebGui WebGui /Mod/Web) -if(WIN32) - set_target_properties(WebGui PROPERTIES PREFIX "") - set_target_properties(WebGui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(WebGui) INSTALL(TARGETS WebGui DESTINATION lib) diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt index ee4136de5..6a00bebf7 100644 --- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt +++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt @@ -28,9 +28,6 @@ fc_target_copy_resource(_TEMPLATE_ Init.py) SET_BIN_DIR(_TEMPLATE_ _TEMPLATE_ /Mod/_TEMPLATE_) -if(WIN32) - set_target_properties(_TEMPLATE_ PROPERTIES PREFIX "") - set_target_properties(_TEMPLATE_ PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_) install(TARGETS _TEMPLATE_ DESTINATION lib) diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt index 455ac573f..d37869e5e 100644 --- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt +++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt @@ -38,9 +38,6 @@ fc_target_copy_resource(_TEMPLATE_Gui InitGui.py) SET_BIN_DIR(_TEMPLATE_Gui _TEMPLATE_Gui /Mod/_TEMPLATE_) -if(WIN32) - set_target_properties(_TEMPLATE_Gui PROPERTIES PREFIX "") - set_target_properties(_TEMPLATE_Gui PROPERTIES SUFFIX ".pyd") -endif(WIN32) +SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_Gui) install(TARGETS _TEMPLATE_Gui DESTINATION lib)