Add initial support for different libdir (jobermayr)

2014-05-10 12:57:38 +02:00
parent 33a4b6d7ba
commit 6b89c03181
52 changed files with 81 additions and 76 deletions
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -33,4 +33,4 @@ fc_target_copy_resource(Assembly
 SET_BIN_DIR(Assembly Assembly /Mod/Assembly)
 SET_PYTHON_PREFIX_SUFFIX(Assembly)

-INSTALL(TARGETS Assembly DESTINATION lib)
+INSTALL(TARGETS Assembly DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -43,4 +43,4 @@ fc_target_copy_resource(AssemblyGui
 SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly)
 SET_PYTHON_PREFIX_SUFFIX(AssemblyGui)

-INSTALL(TARGETS AssemblyGui DESTINATION lib)
+INSTALL(TARGETS AssemblyGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Cam/App/CMakeLists.txt
+++ b/src/Mod/Cam/App/CMakeLists.txt
@@ -99,4 +99,4 @@ if(WIN32)
    set_target_properties(Cam PROPERTIES SUFFIX ".pyd")
 endif(WIN32)

-INSTALL(TARGETS Cam DESTINATION lib)
+INSTALL(TARGETS Cam DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Cam/Gui/CMakeLists.txt
+++ b/src/Mod/Cam/Gui/CMakeLists.txt
@@ -76,4 +76,4 @@ if(WIN32)
    set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")
 endif(WIN32)

-INSTALL(TARGETS CamGui DESTINATION lib)
+INSTALL(TARGETS CamGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Complete/App/CMakeLists.txt
+++ b/src/Mod/Complete/App/CMakeLists.txt
@@ -33,4 +33,4 @@ fc_target_copy_resource(Complete
 SET_BIN_DIR(Complete Complete /Mod/Complete)
 SET_PYTHON_PREFIX_SUFFIX(Complete)

-INSTALL(TARGETS Complete DESTINATION lib)
+INSTALL(TARGETS Complete DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Complete/Gui/CMakeLists.txt
+++ b/src/Mod/Complete/Gui/CMakeLists.txt
@@ -39,4 +39,4 @@ fc_target_copy_resource(CompleteGui
 SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete)
 SET_PYTHON_PREFIX_SUFFIX(CompleteGui)

-install(TARGETS CompleteGui DESTINATION lib)
+install(TARGETS CompleteGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -89,4 +89,4 @@ fc_target_copy_resource(Drawing
 SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
 SET_PYTHON_PREFIX_SUFFIX(Drawing)

-INSTALL(TARGETS Drawing DESTINATION lib)
+INSTALL(TARGETS Drawing DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -99,4 +99,4 @@ fc_target_copy_resource(DrawingGui
 SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing)
 SET_PYTHON_PREFIX_SUFFIX(DrawingGui)

-INSTALL(TARGETS DrawingGui DESTINATION lib)
+INSTALL(TARGETS DrawingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -159,4 +159,4 @@ fc_target_copy_resource(Fem
 SET_BIN_DIR(Fem Fem /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(Fem)

-INSTALL(TARGETS Fem DESTINATION lib)
+INSTALL(TARGETS Fem DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -208,4 +208,4 @@ fc_target_copy_resource(FemGui
 SET_BIN_DIR(FemGui FemGui /Mod/Fem)
 SET_PYTHON_PREFIX_SUFFIX(FemGui)

-INSTALL(TARGETS FemGui DESTINATION lib)
+INSTALL(TARGETS FemGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Image/App/CMakeLists.txt
+++ b/src/Mod/Image/App/CMakeLists.txt
@@ -40,4 +40,4 @@ fc_target_copy_resource(Image
 SET_BIN_DIR(Image Image /Mod/Image)
 SET_PYTHON_PREFIX_SUFFIX(Image)

-INSTALL(TARGETS Image DESTINATION lib)
+INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@@ -72,4 +72,4 @@ fc_target_copy_resource(ImageGui
 SET_BIN_DIR(ImageGui ImageGui /Mod/Image)
 SET_PYTHON_PREFIX_SUFFIX(ImageGui)

-INSTALL(TARGETS ImageGui DESTINATION lib)
+INSTALL(TARGETS ImageGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -73,4 +73,4 @@ fc_target_copy_resource(ImportPy
 SET_BIN_DIR(Import Import /Mod/Import)
 SET_PYTHON_PREFIX_SUFFIX(Import)

-INSTALL(TARGETS Import DESTINATION lib)
+INSTALL(TARGETS Import DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -50,4 +50,4 @@ fc_target_copy_resource(ImportGui
 SET_BIN_DIR(ImportGui ImportGui /Mod/Import)
 SET_PYTHON_PREFIX_SUFFIX(ImportGui)

-INSTALL(TARGETS ImportGui DESTINATION lib)
+INSTALL(TARGETS ImportGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -46,4 +46,4 @@ fc_target_copy_resource(Inspection
 SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
 SET_PYTHON_PREFIX_SUFFIX(Inspection)

-INSTALL(TARGETS Inspection DESTINATION lib)
+INSTALL(TARGETS Inspection DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -62,4 +62,4 @@ fc_target_copy_resource(InspectionGui
 SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection)
 SET_PYTHON_PREFIX_SUFFIX(InspectionGui)

-INSTALL(TARGETS InspectionGui DESTINATION lib)
+INSTALL(TARGETS InspectionGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -354,4 +354,4 @@ fc_target_copy_resource(Mesh
 SET_BIN_DIR(Mesh Mesh /Mod/Mesh)
 SET_PYTHON_PREFIX_SUFFIX(Mesh)

-INSTALL(TARGETS Mesh DESTINATION lib)
+INSTALL(TARGETS Mesh DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -132,4 +132,4 @@ fc_target_copy_resource(MeshGui
 SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh)
 SET_PYTHON_PREFIX_SUFFIX(MeshGui)

-INSTALL(TARGETS MeshGui DESTINATION lib)
+INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -70,4 +70,4 @@ fc_target_copy_resource(MeshPart
 SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart)
 SET_PYTHON_PREFIX_SUFFIX(MeshPart)

-INSTALL(TARGETS MeshPart DESTINATION lib)
+INSTALL(TARGETS MeshPart DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -73,4 +73,4 @@ fc_target_copy_resource(MeshPartGui
 SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart)
 SET_PYTHON_PREFIX_SUFFIX(MeshPartGui)

-INSTALL(TARGETS MeshPartGui DESTINATION lib)
+INSTALL(TARGETS MeshPartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -266,4 +266,4 @@ fc_target_copy_resource(Part
 SET_BIN_DIR(Part Part /Mod/Part)
 SET_PYTHON_PREFIX_SUFFIX(Part)

-INSTALL(TARGETS Part DESTINATION lib)
+INSTALL(TARGETS Part DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -234,4 +234,4 @@ fc_target_copy_resource(PartGui
 SET_BIN_DIR(PartGui PartGui /Mod/Part)
 SET_PYTHON_PREFIX_SUFFIX(PartGui)

-INSTALL(TARGETS PartGui DESTINATION lib)
+INSTALL(TARGETS PartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -108,6 +108,7 @@ SET(PartDesign_Scripts
    Scripts/Gear.py
    Scripts/DistanceBolt.py
    Scripts/Epitrochoid.py
+    Scripts/FilletArc.py
    Scripts/RadialCopy.py
    Scripts/Parallelepiped.py
    Scripts/Spring.py
@@ -127,11 +128,8 @@ fc_target_copy_resource(PartDesign
    ${CMAKE_BINARY_DIR}/Mod/PartDesign
    ${PartDesign_Scripts})

-# 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)
+SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign)
 SET_PYTHON_PREFIX_SUFFIX(PartDesign)

-# The PartDesign module must go to where the __init__.py file is
-INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)
+INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR})

--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -189,11 +189,8 @@ fc_target_copy_resource(PartDesignGui
    ${CMAKE_BINARY_DIR}/Mod/PartDesign
    ${PartDesignGui_Scripts})

-# 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)
+SET_BIN_DIR(PartDesignGui PartDesignGui /Mod/PartDesign)
 SET_PYTHON_PREFIX_SUFFIX(PartDesignGui)

-# The PartDesign module must go to where the __init__.py file is
-INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)
+INSTALL(TARGETS PartDesignGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

--- a/src/Mod/PartDesign/Init.py
+++ b/src/Mod/PartDesign/Init.py
@@ -25,7 +25,6 @@
 #*   Juergen Riegel 2002                                                   *
 #***************************************************************************/

-
 class PartDesignDocument:
 	"PartDesign document"
 	def Info(self):
--- a/src/Mod/PartDesign/init.py
+++ b/src/Mod/PartDesign/init.py
@@ -1,2 +1,2 @@
-import PartDesign
-makeFilletArc = PartDesign.makeFilletArc
+import Scripts.FilletArc
+makeFilletArc = Scripts.FilletArc.makeFilletArc
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -53,4 +53,4 @@ fc_target_copy_resource(Points
 SET_BIN_DIR(Points Points /Mod/Points)
 SET_PYTHON_PREFIX_SUFFIX(Points)

-INSTALL(TARGETS Points DESTINATION lib)
+INSTALL(TARGETS Points DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -64,4 +64,4 @@ fc_target_copy_resource(PointsGui
 SET_BIN_DIR(PointsGui PointsGui /Mod/Points)
 SET_PYTHON_PREFIX_SUFFIX(PointsGui)

-INSTALL(TARGETS PointsGui DESTINATION lib)
+INSTALL(TARGETS PointsGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@@ -87,4 +87,4 @@ fc_target_copy_resource(Raytracing
 SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing)
 SET_PYTHON_PREFIX_SUFFIX(Raytracing)

-INSTALL(TARGETS Raytracing DESTINATION lib)
+INSTALL(TARGETS Raytracing DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -88,4 +88,4 @@ fc_target_copy_resource(RaytracingGui
 SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing)
 SET_PYTHON_PREFIX_SUFFIX(RaytracingGui)

-INSTALL(TARGETS RaytracingGui DESTINATION lib)
+INSTALL(TARGETS RaytracingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -42,4 +42,4 @@ fc_target_copy_resource(ReverseEngineering
 SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
 SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)

-INSTALL(TARGETS ReverseEngineering DESTINATION lib)
+INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -50,4 +50,4 @@ fc_target_copy_resource(ReverseEngineeringGui
 SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering)
 SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui)

-install(TARGETS ReverseEngineeringGui DESTINATION lib)
+install(TARGETS ReverseEngineeringGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -142,4 +142,4 @@ fc_target_copy_resource(Robot
 SET_BIN_DIR(Robot Robot /Mod/Robot)
 SET_PYTHON_PREFIX_SUFFIX(Robot)

-INSTALL(TARGETS Robot DESTINATION lib)
+INSTALL(TARGETS Robot DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -157,4 +157,4 @@ fc_target_copy_resource(RobotGui
 SET_BIN_DIR(RobotGui RobotGui /Mod/Robot)
 SET_PYTHON_PREFIX_SUFFIX(RobotGui)

-INSTALL(TARGETS RobotGui DESTINATION lib)
+INSTALL(TARGETS RobotGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -41,4 +41,4 @@ fc_target_copy_resource(Sandbox
 SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox)
 SET_PYTHON_PREFIX_SUFFIX(Sandbox)

-INSTALL(TARGETS Sandbox DESTINATION lib)
+INSTALL(TARGETS Sandbox DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -52,4 +52,4 @@ fc_target_copy_resource(SandboxGui
 SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox)
 SET_PYTHON_PREFIX_SUFFIX(SandboxGui)

-INSTALL(TARGETS SandboxGui DESTINATION lib)
+INSTALL(TARGETS SandboxGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -121,4 +121,4 @@ fc_target_copy_resource(Sketcher
 SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher)
 SET_PYTHON_PREFIX_SUFFIX(Sketcher)

-INSTALL(TARGETS Sketcher DESTINATION lib)
+INSTALL(TARGETS Sketcher DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -118,4 +118,4 @@ fc_target_copy_resource(SketcherGui
 SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher)
 SET_PYTHON_PREFIX_SUFFIX(SketcherGui)

-INSTALL(TARGETS SketcherGui DESTINATION lib)
+INSTALL(TARGETS SketcherGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -32,4 +32,4 @@ fc_target_copy_resource(Start
 SET_BIN_DIR(Start Start /Mod/Start)
 SET_PYTHON_PREFIX_SUFFIX(Start)

-INSTALL(TARGETS Start DESTINATION lib)
+INSTALL(TARGETS Start DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -78,4 +78,4 @@ fc_target_copy_resource(StartGui
 SET_BIN_DIR(StartGui StartGui /Mod/Start)
 SET_PYTHON_PREFIX_SUFFIX(StartGui)

-INSTALL(TARGETS StartGui DESTINATION lib)
+INSTALL(TARGETS StartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -58,6 +58,6 @@ fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py)
 SET_BIN_DIR(QtUnitGui QtUnitGui /Mod/Test)
 SET_PYTHON_PREFIX_SUFFIX(QtUnitGui)

-INSTALL(TARGETS QtUnitGui DESTINATION lib)
+INSTALL(TARGETS QtUnitGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test)

--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -49,4 +49,4 @@ fc_target_copy_resource(Web
 SET_BIN_DIR(Web Web /Mod/Web)
 SET_PYTHON_PREFIX_SUFFIX(Web)

-install(TARGETS Web DESTINATION lib)
+install(TARGETS Web DESTINATION ${CMAKE_INSTALL_LIBDIR})
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -46,4 +46,4 @@ fc_target_copy_resource(WebGui
 SET_BIN_DIR(WebGui WebGui /Mod/Web)
 SET_PYTHON_PREFIX_SUFFIX(WebGui)

-INSTALL(TARGETS WebGui DESTINATION lib)
+INSTALL(TARGETS WebGui DESTINATION ${CMAKE_INSTALL_LIBDIR})