suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add initial support for different libdir (jobermayr)

Browse Source
This commit is contained in:
wmayer 2014-05-10 12:57:38 +02:00
parent 33a4b6d7ba
commit 6b89c03181
52 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -69,12 +69,19 @@ if(WIN32)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory") SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
else(WIN32) else(WIN32)
SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory") SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif(WIN32) endif(WIN32)
SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
# Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py
SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
if(NOT WIN32)
if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
SET(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
endif(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
endif(NOT WIN32)
SET(PYCXX_INCLUDE_DIR SET(PYCXX_INCLUDE_DIR
"${CMAKE_SOURCE_DIR}/src" CACHE PATH "${CMAKE_SOURCE_DIR}/src" CACHE PATH
@ -91,6 +98,7 @@ MESSAGE(STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}") MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}") MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}") MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
MESSAGE(STATUS "libdir: ${CMAKE_INSTALL_LIBDIR}")
# ============================================================================== # ==============================================================================
# == Win32 is default behaviour use the LibPack copied in Source tree ========== # == Win32 is default behaviour use the LibPack copied in Source tree ==========

5
cMake/FreeCadMacros.cmake
View File

@ -230,11 +230,14 @@ MACRO(SET_BIN_DIR ProjectName OutputName)
if(WIN32) if(WIN32)
set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME ${OutputName}_d) set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME ${OutputName}_d)
else(WIN32) else(WIN32)
# FreeCADBase, SMDS, Driver and MEFISTO2 libs don't depend on parts from CMAKE_INSTALL_LIBDIR
if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2)$")
if(${ARGC} STREQUAL 4) if(${ARGC} STREQUAL 4)
set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3}) set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3})
else(${ARGC} STREQUAL 4) else(${ARGC} STREQUAL 4)
set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
endif(${ARGC} STREQUAL 4) endif(${ARGC} STREQUAL 4)
endif(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2)$")
endif(WIN32) endif(WIN32)
ENDMACRO(SET_BIN_DIR) ENDMACRO(SET_BIN_DIR)

4
src/3rdParty/salomesmesh/CMakeLists.txt vendored
View File

@ -368,7 +368,7 @@ if(WIN32)
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH MEFISTO2 StdMeshers
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)
@ -380,7 +380,7 @@ if (FREECAD_BUILD_FEM_NETGEN)
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS NETGENPlugin INSTALL(TARGETS NETGENPlugin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)
endif (FREECAD_BUILD_FEM_NETGEN) endif (FREECAD_BUILD_FEM_NETGEN)

4
src/App/CMakeLists.txt
View File

@ -182,10 +182,10 @@ SET_BIN_DIR(FreeCADApp FreeCADApp)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADApp INSTALL(TARGETS FreeCADApp
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADApp INSTALL(TARGETS FreeCADApp
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)

4
src/Base/CMakeLists.txt
View File

@ -324,10 +324,10 @@ SET_BIN_DIR(FreeCADBase FreeCADBase)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADBase INSTALL(TARGETS FreeCADBase
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADBase INSTALL(TARGETS FreeCADBase
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)

4
src/Gui/CMakeLists.txt
View File

@ -937,11 +937,11 @@ SET_BIN_DIR(FreeCADGui FreeCADGui)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADGui INSTALL(TARGETS FreeCADGui
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADGui INSTALL(TARGETS FreeCADGui
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
INSTALL(FILES Icons/freecad.xpm INSTALL(FILES Icons/freecad.xpm
Icons/freecad-icon-16.png Icons/freecad-icon-16.png

12
src/Main/CMakeLists.txt
View File

@ -50,7 +50,7 @@ if(FREECAD_BUILD_GUI)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADMain INSTALL(TARGETS FreeCADMain
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADMain INSTALL(TARGETS FreeCADMain
@ -76,7 +76,7 @@ SET_BIN_DIR(FreeCADMainCmd FreeCADCmd)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADMainCmd INSTALL(TARGETS FreeCADMainCmd
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADMainCmd INSTALL(TARGETS FreeCADMainCmd
@ -100,11 +100,11 @@ SET_PYTHON_PREFIX_SUFFIX(FreeCADMainPy)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADMainPy INSTALL(TARGETS FreeCADMainPy
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADMainPy INSTALL(TARGETS FreeCADMainPy
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)
@ -131,11 +131,11 @@ if(FREECAD_BUILD_GUI)
if(WIN32) if(WIN32)
INSTALL(TARGETS FreeCADGuiPy INSTALL(TARGETS FreeCADGuiPy
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
else(WIN32) else(WIN32)
INSTALL(TARGETS FreeCADGuiPy INSTALL(TARGETS FreeCADGuiPy
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
endif(WIN32) endif(WIN32)
endif(FREECAD_BUILD_GUI) endif(FREECAD_BUILD_GUI)

2
src/Mod/Assembly/App/CMakeLists.txt
View File

@ -33,4 +33,4 @@ fc_target_copy_resource(Assembly
SET_BIN_DIR(Assembly Assembly /Mod/Assembly) SET_BIN_DIR(Assembly Assembly /Mod/Assembly)
SET_PYTHON_PREFIX_SUFFIX(Assembly) SET_PYTHON_PREFIX_SUFFIX(Assembly)
INSTALL(TARGETS Assembly DESTINATION lib) INSTALL(TARGETS Assembly DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Assembly/Gui/CMakeLists.txt
View File

@ -43,4 +43,4 @@ fc_target_copy_resource(AssemblyGui
SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly) SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly)
SET_PYTHON_PREFIX_SUFFIX(AssemblyGui) SET_PYTHON_PREFIX_SUFFIX(AssemblyGui)
INSTALL(TARGETS AssemblyGui DESTINATION lib) INSTALL(TARGETS AssemblyGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Cam/App/CMakeLists.txt
View File

@ -99,4 +99,4 @@ if(WIN32)
set_target_properties(Cam PROPERTIES SUFFIX ".pyd") set_target_properties(Cam PROPERTIES SUFFIX ".pyd")
endif(WIN32) endif(WIN32)
INSTALL(TARGETS Cam DESTINATION lib) INSTALL(TARGETS Cam DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Cam/Gui/CMakeLists.txt
View File

@ -76,4 +76,4 @@ if(WIN32)
set_target_properties(CamGui PROPERTIES SUFFIX ".pyd") set_target_properties(CamGui PROPERTIES SUFFIX ".pyd")
endif(WIN32) endif(WIN32)
INSTALL(TARGETS CamGui DESTINATION lib) INSTALL(TARGETS CamGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Complete/App/CMakeLists.txt
View File

@ -33,4 +33,4 @@ fc_target_copy_resource(Complete
SET_BIN_DIR(Complete Complete /Mod/Complete) SET_BIN_DIR(Complete Complete /Mod/Complete)
SET_PYTHON_PREFIX_SUFFIX(Complete) SET_PYTHON_PREFIX_SUFFIX(Complete)
INSTALL(TARGETS Complete DESTINATION lib) INSTALL(TARGETS Complete DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Complete/Gui/CMakeLists.txt
View File

@ -39,4 +39,4 @@ fc_target_copy_resource(CompleteGui
SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete) SET_BIN_DIR(CompleteGui CompleteGui /Mod/Complete)
SET_PYTHON_PREFIX_SUFFIX(CompleteGui) SET_PYTHON_PREFIX_SUFFIX(CompleteGui)
install(TARGETS CompleteGui DESTINATION lib) install(TARGETS CompleteGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Drawing/App/CMakeLists.txt
View File

@ -89,4 +89,4 @@ fc_target_copy_resource(Drawing
SET_BIN_DIR(Drawing Drawing /Mod/Drawing) SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
SET_PYTHON_PREFIX_SUFFIX(Drawing) SET_PYTHON_PREFIX_SUFFIX(Drawing)
INSTALL(TARGETS Drawing DESTINATION lib) INSTALL(TARGETS Drawing DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Drawing/Gui/CMakeLists.txt
View File

@ -99,4 +99,4 @@ fc_target_copy_resource(DrawingGui
SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing) SET_BIN_DIR(DrawingGui DrawingGui /Mod/Drawing)
SET_PYTHON_PREFIX_SUFFIX(DrawingGui) SET_PYTHON_PREFIX_SUFFIX(DrawingGui)
INSTALL(TARGETS DrawingGui DESTINATION lib) INSTALL(TARGETS DrawingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Fem/App/CMakeLists.txt
View File

@ -159,4 +159,4 @@ fc_target_copy_resource(Fem
SET_BIN_DIR(Fem Fem /Mod/Fem) SET_BIN_DIR(Fem Fem /Mod/Fem)
SET_PYTHON_PREFIX_SUFFIX(Fem) SET_PYTHON_PREFIX_SUFFIX(Fem)
INSTALL(TARGETS Fem DESTINATION lib) INSTALL(TARGETS Fem DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Fem/Gui/CMakeLists.txt
View File

@ -208,4 +208,4 @@ fc_target_copy_resource(FemGui
SET_BIN_DIR(FemGui FemGui /Mod/Fem) SET_BIN_DIR(FemGui FemGui /Mod/Fem)
SET_PYTHON_PREFIX_SUFFIX(FemGui) SET_PYTHON_PREFIX_SUFFIX(FemGui)
INSTALL(TARGETS FemGui DESTINATION lib) INSTALL(TARGETS FemGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Image/App/CMakeLists.txt
View File

@ -40,4 +40,4 @@ fc_target_copy_resource(Image
SET_BIN_DIR(Image Image /Mod/Image) SET_BIN_DIR(Image Image /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(Image) SET_PYTHON_PREFIX_SUFFIX(Image)
INSTALL(TARGETS Image DESTINATION lib) INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Image/Gui/CMakeLists.txt
View File

@ -72,4 +72,4 @@ fc_target_copy_resource(ImageGui
SET_BIN_DIR(ImageGui ImageGui /Mod/Image) SET_BIN_DIR(ImageGui ImageGui /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(ImageGui) SET_PYTHON_PREFIX_SUFFIX(ImageGui)
INSTALL(TARGETS ImageGui DESTINATION lib) INSTALL(TARGETS ImageGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Import/App/CMakeLists.txt
View File

@ -73,4 +73,4 @@ fc_target_copy_resource(ImportPy
SET_BIN_DIR(Import Import /Mod/Import) SET_BIN_DIR(Import Import /Mod/Import)
SET_PYTHON_PREFIX_SUFFIX(Import) SET_PYTHON_PREFIX_SUFFIX(Import)
INSTALL(TARGETS Import DESTINATION lib) INSTALL(TARGETS Import DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Import/Gui/CMakeLists.txt
View File

@ -50,4 +50,4 @@ fc_target_copy_resource(ImportGui
SET_BIN_DIR(ImportGui ImportGui /Mod/Import) SET_BIN_DIR(ImportGui ImportGui /Mod/Import)
SET_PYTHON_PREFIX_SUFFIX(ImportGui) SET_PYTHON_PREFIX_SUFFIX(ImportGui)
INSTALL(TARGETS ImportGui DESTINATION lib) INSTALL(TARGETS ImportGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Inspection/App/CMakeLists.txt
View File

@ -46,4 +46,4 @@ fc_target_copy_resource(Inspection
SET_BIN_DIR(Inspection Inspection /Mod/Inspection) SET_BIN_DIR(Inspection Inspection /Mod/Inspection)
SET_PYTHON_PREFIX_SUFFIX(Inspection) SET_PYTHON_PREFIX_SUFFIX(Inspection)
INSTALL(TARGETS Inspection DESTINATION lib) INSTALL(TARGETS Inspection DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Inspection/Gui/CMakeLists.txt
View File

@ -62,4 +62,4 @@ fc_target_copy_resource(InspectionGui
SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection) SET_BIN_DIR(InspectionGui InspectionGui /Mod/Inspection)
SET_PYTHON_PREFIX_SUFFIX(InspectionGui) SET_PYTHON_PREFIX_SUFFIX(InspectionGui)
INSTALL(TARGETS InspectionGui DESTINATION lib) INSTALL(TARGETS InspectionGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Mesh/App/CMakeLists.txt
View File

@ -354,4 +354,4 @@ fc_target_copy_resource(Mesh
SET_BIN_DIR(Mesh Mesh /Mod/Mesh) SET_BIN_DIR(Mesh Mesh /Mod/Mesh)
SET_PYTHON_PREFIX_SUFFIX(Mesh) SET_PYTHON_PREFIX_SUFFIX(Mesh)
INSTALL(TARGETS Mesh DESTINATION lib) INSTALL(TARGETS Mesh DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Mesh/Gui/CMakeLists.txt
View File

@ -132,4 +132,4 @@ fc_target_copy_resource(MeshGui
SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh)
SET_PYTHON_PREFIX_SUFFIX(MeshGui) SET_PYTHON_PREFIX_SUFFIX(MeshGui)
INSTALL(TARGETS MeshGui DESTINATION lib) INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/MeshPart/App/CMakeLists.txt
View File

@ -70,4 +70,4 @@ fc_target_copy_resource(MeshPart
SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart) SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart)
SET_PYTHON_PREFIX_SUFFIX(MeshPart) SET_PYTHON_PREFIX_SUFFIX(MeshPart)
INSTALL(TARGETS MeshPart DESTINATION lib) INSTALL(TARGETS MeshPart DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/MeshPart/Gui/CMakeLists.txt
View File

@ -73,4 +73,4 @@ fc_target_copy_resource(MeshPartGui
SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart) SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart)
SET_PYTHON_PREFIX_SUFFIX(MeshPartGui) SET_PYTHON_PREFIX_SUFFIX(MeshPartGui)
INSTALL(TARGETS MeshPartGui DESTINATION lib) INSTALL(TARGETS MeshPartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Part/App/CMakeLists.txt
View File

@ -266,4 +266,4 @@ fc_target_copy_resource(Part
SET_BIN_DIR(Part Part /Mod/Part) SET_BIN_DIR(Part Part /Mod/Part)
SET_PYTHON_PREFIX_SUFFIX(Part) SET_PYTHON_PREFIX_SUFFIX(Part)
INSTALL(TARGETS Part DESTINATION lib) INSTALL(TARGETS Part DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Part/Gui/CMakeLists.txt
View File

@ -234,4 +234,4 @@ fc_target_copy_resource(PartGui
SET_BIN_DIR(PartGui PartGui /Mod/Part) SET_BIN_DIR(PartGui PartGui /Mod/Part)
SET_PYTHON_PREFIX_SUFFIX(PartGui) SET_PYTHON_PREFIX_SUFFIX(PartGui)
INSTALL(TARGETS PartGui DESTINATION lib) INSTALL(TARGETS PartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

8
src/Mod/PartDesign/App/CMakeLists.txt
View File

@ -108,6 +108,7 @@ SET(PartDesign_Scripts
Scripts/Gear.py Scripts/Gear.py
Scripts/DistanceBolt.py Scripts/DistanceBolt.py
Scripts/Epitrochoid.py Scripts/Epitrochoid.py
Scripts/FilletArc.py
Scripts/RadialCopy.py Scripts/RadialCopy.py
Scripts/Parallelepiped.py Scripts/Parallelepiped.py
Scripts/Spring.py Scripts/Spring.py
@ -127,11 +128,8 @@ fc_target_copy_resource(PartDesign
${CMAKE_BINARY_DIR}/Mod/PartDesign ${CMAKE_BINARY_DIR}/Mod/PartDesign
${PartDesign_Scripts}) ${PartDesign_Scripts})
# See link for why this module is installed differently from the other modules: SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign)
# http://forum.freecadweb.org/viewtopic.php?f=19&t=5444
SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign /Mod/PartDesign)
SET_PYTHON_PREFIX_SUFFIX(PartDesign) SET_PYTHON_PREFIX_SUFFIX(PartDesign)
# The PartDesign module must go to where the __init__.py file is INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)

7
src/Mod/PartDesign/Gui/CMakeLists.txt
View File

@ -189,11 +189,8 @@ fc_target_copy_resource(PartDesignGui
${CMAKE_BINARY_DIR}/Mod/PartDesign ${CMAKE_BINARY_DIR}/Mod/PartDesign
${PartDesignGui_Scripts}) ${PartDesignGui_Scripts})
# See link for why this module is installed differently from the other modules: SET_BIN_DIR(PartDesignGui PartDesignGui /Mod/PartDesign)
# http://forum.freecadweb.org/viewtopic.php?f=19&t=5444
SET_BIN_DIR(PartDesignGui PartDesignGui /Mod/PartDesign /Mod/PartDesign)
SET_PYTHON_PREFIX_SUFFIX(PartDesignGui) SET_PYTHON_PREFIX_SUFFIX(PartDesignGui)
# The PartDesign module must go to where the __init__.py file is INSTALL(TARGETS PartDesignGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)

1
src/Mod/PartDesign/Init.py
View File

@ -25,7 +25,6 @@
#* Juergen Riegel 2002 * #* Juergen Riegel 2002 *
#***************************************************************************/ #***************************************************************************/
class PartDesignDocument: class PartDesignDocument:
"PartDesign document" "PartDesign document"
def Info(self): def Info(self):

4
src/Mod/PartDesign/__init__.py
View File

@ -1,2 +1,2 @@
import PartDesign import Scripts.FilletArc
makeFilletArc = PartDesign.makeFilletArc makeFilletArc = Scripts.FilletArc.makeFilletArc

2
src/Mod/Points/App/CMakeLists.txt
View File

@ -53,4 +53,4 @@ fc_target_copy_resource(Points
SET_BIN_DIR(Points Points /Mod/Points) SET_BIN_DIR(Points Points /Mod/Points)
SET_PYTHON_PREFIX_SUFFIX(Points) SET_PYTHON_PREFIX_SUFFIX(Points)
INSTALL(TARGETS Points DESTINATION lib) INSTALL(TARGETS Points DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Points/Gui/CMakeLists.txt
View File

@ -64,4 +64,4 @@ fc_target_copy_resource(PointsGui
SET_BIN_DIR(PointsGui PointsGui /Mod/Points) SET_BIN_DIR(PointsGui PointsGui /Mod/Points)
SET_PYTHON_PREFIX_SUFFIX(PointsGui) SET_PYTHON_PREFIX_SUFFIX(PointsGui)
INSTALL(TARGETS PointsGui DESTINATION lib) INSTALL(TARGETS PointsGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Raytracing/App/CMakeLists.txt
View File

@ -87,4 +87,4 @@ fc_target_copy_resource(Raytracing
SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing) SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing)
SET_PYTHON_PREFIX_SUFFIX(Raytracing) SET_PYTHON_PREFIX_SUFFIX(Raytracing)
INSTALL(TARGETS Raytracing DESTINATION lib) INSTALL(TARGETS Raytracing DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Raytracing/Gui/CMakeLists.txt
View File

@ -88,4 +88,4 @@ fc_target_copy_resource(RaytracingGui
SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing) SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing)
SET_PYTHON_PREFIX_SUFFIX(RaytracingGui) SET_PYTHON_PREFIX_SUFFIX(RaytracingGui)
INSTALL(TARGETS RaytracingGui DESTINATION lib) INSTALL(TARGETS RaytracingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/ReverseEngineering/App/CMakeLists.txt
View File

@ -42,4 +42,4 @@ fc_target_copy_resource(ReverseEngineering
SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering) SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering) SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)
INSTALL(TARGETS ReverseEngineering DESTINATION lib) INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/ReverseEngineering/Gui/CMakeLists.txt
View File

@ -50,4 +50,4 @@ fc_target_copy_resource(ReverseEngineeringGui
SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering) SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering)
SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui) SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui)
install(TARGETS ReverseEngineeringGui DESTINATION lib) install(TARGETS ReverseEngineeringGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Robot/App/CMakeLists.txt
View File

@ -142,4 +142,4 @@ fc_target_copy_resource(Robot
SET_BIN_DIR(Robot Robot /Mod/Robot) SET_BIN_DIR(Robot Robot /Mod/Robot)
SET_PYTHON_PREFIX_SUFFIX(Robot) SET_PYTHON_PREFIX_SUFFIX(Robot)
INSTALL(TARGETS Robot DESTINATION lib) INSTALL(TARGETS Robot DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Robot/Gui/CMakeLists.txt
View File

@ -157,4 +157,4 @@ fc_target_copy_resource(RobotGui
SET_BIN_DIR(RobotGui RobotGui /Mod/Robot) SET_BIN_DIR(RobotGui RobotGui /Mod/Robot)
SET_PYTHON_PREFIX_SUFFIX(RobotGui) SET_PYTHON_PREFIX_SUFFIX(RobotGui)
INSTALL(TARGETS RobotGui DESTINATION lib) INSTALL(TARGETS RobotGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Sandbox/App/CMakeLists.txt
View File

@ -41,4 +41,4 @@ fc_target_copy_resource(Sandbox
SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox) SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox)
SET_PYTHON_PREFIX_SUFFIX(Sandbox) SET_PYTHON_PREFIX_SUFFIX(Sandbox)
INSTALL(TARGETS Sandbox DESTINATION lib) INSTALL(TARGETS Sandbox DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Sandbox/Gui/CMakeLists.txt
View File

@ -52,4 +52,4 @@ fc_target_copy_resource(SandboxGui
SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox) SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox)
SET_PYTHON_PREFIX_SUFFIX(SandboxGui) SET_PYTHON_PREFIX_SUFFIX(SandboxGui)
INSTALL(TARGETS SandboxGui DESTINATION lib) INSTALL(TARGETS SandboxGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Sketcher/App/CMakeLists.txt
View File

@ -121,4 +121,4 @@ fc_target_copy_resource(Sketcher
SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher) SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher)
SET_PYTHON_PREFIX_SUFFIX(Sketcher) SET_PYTHON_PREFIX_SUFFIX(Sketcher)
INSTALL(TARGETS Sketcher DESTINATION lib) INSTALL(TARGETS Sketcher DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Sketcher/Gui/CMakeLists.txt
View File

@ -118,4 +118,4 @@ fc_target_copy_resource(SketcherGui
SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher) SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher)
SET_PYTHON_PREFIX_SUFFIX(SketcherGui) SET_PYTHON_PREFIX_SUFFIX(SketcherGui)
INSTALL(TARGETS SketcherGui DESTINATION lib) INSTALL(TARGETS SketcherGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Start/App/CMakeLists.txt
View File

@ -32,4 +32,4 @@ fc_target_copy_resource(Start
SET_BIN_DIR(Start Start /Mod/Start) SET_BIN_DIR(Start Start /Mod/Start)
SET_PYTHON_PREFIX_SUFFIX(Start) SET_PYTHON_PREFIX_SUFFIX(Start)
INSTALL(TARGETS Start DESTINATION lib) INSTALL(TARGETS Start DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Start/Gui/CMakeLists.txt
View File

@ -78,4 +78,4 @@ fc_target_copy_resource(StartGui
SET_BIN_DIR(StartGui StartGui /Mod/Start) SET_BIN_DIR(StartGui StartGui /Mod/Start)
SET_PYTHON_PREFIX_SUFFIX(StartGui) SET_PYTHON_PREFIX_SUFFIX(StartGui)
INSTALL(TARGETS StartGui DESTINATION lib) INSTALL(TARGETS StartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Test/Gui/CMakeLists.txt
View File

@ -58,6 +58,6 @@ 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)
SET_PYTHON_PREFIX_SUFFIX(QtUnitGui) SET_PYTHON_PREFIX_SUFFIX(QtUnitGui)
INSTALL(TARGETS QtUnitGui DESTINATION lib) INSTALL(TARGETS QtUnitGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test) INSTALL(FILES ${TestGuiPy_SRCS} DESTINATION Mod/Test)

2
src/Mod/Web/App/CMakeLists.txt
View File

@ -49,4 +49,4 @@ fc_target_copy_resource(Web
SET_BIN_DIR(Web Web /Mod/Web) SET_BIN_DIR(Web Web /Mod/Web)
SET_PYTHON_PREFIX_SUFFIX(Web) SET_PYTHON_PREFIX_SUFFIX(Web)
install(TARGETS Web DESTINATION lib) install(TARGETS Web DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Mod/Web/Gui/CMakeLists.txt
View File

@ -46,4 +46,4 @@ fc_target_copy_resource(WebGui
SET_BIN_DIR(WebGui WebGui /Mod/Web) SET_BIN_DIR(WebGui WebGui /Mod/Web)
SET_PYTHON_PREFIX_SUFFIX(WebGui) SET_PYTHON_PREFIX_SUFFIX(WebGui)
INSTALL(TARGETS WebGui DESTINATION lib) INSTALL(TARGETS WebGui DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Tools/_TEMPLATE_/App/CMakeLists.txt
View File

@ -30,4 +30,4 @@ fc_target_copy_resource(_TEMPLATE_
SET_BIN_DIR(_TEMPLATE_ _TEMPLATE_ /Mod/_TEMPLATE_) SET_BIN_DIR(_TEMPLATE_ _TEMPLATE_ /Mod/_TEMPLATE_)
SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_) SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_)
install(TARGETS _TEMPLATE_ DESTINATION lib) install(TARGETS _TEMPLATE_ DESTINATION ${CMAKE_INSTALL_LIBDIR})

2
src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
View File

@ -40,4 +40,4 @@ fc_target_copy_resource(_TEMPLATE_Gui
SET_BIN_DIR(_TEMPLATE_Gui _TEMPLATE_Gui /Mod/_TEMPLATE_) SET_BIN_DIR(_TEMPLATE_Gui _TEMPLATE_Gui /Mod/_TEMPLATE_)
SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_Gui) SET_PYTHON_PREFIX_SUFFIX(_TEMPLATE_Gui)
install(TARGETS _TEMPLATE_Gui DESTINATION lib) install(TARGETS _TEMPLATE_Gui DESTINATION ${CMAKE_INSTALL_LIBDIR})