From bde949f7e47adc4520843fb2d29eebbe547cdc17 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 11 Dec 2011 12:36:36 +0000 Subject: [PATCH] 0000519: Patch to set proper RPATH's for system wide installation on Linux git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5270 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- CMakeLists.txt | 15 +++--- data/examples/CMakeLists.txt | 2 +- src/3rdParty/salomesmesh/CMakeLists.txt | 17 ++++--- src/App/CMakeLists.txt | 11 ++++- src/Base/CMakeLists.txt | 1 + src/Doc/CMakeLists.txt | 2 +- src/Gui/CMakeLists.txt | 1 + src/Main/CMakeLists.txt | 7 ++- src/Mod/Arch/CMakeLists.txt | 8 ++-- src/Mod/Assembly/App/CMakeLists.txt | 3 +- src/Mod/Assembly/CMakeLists.txt | 2 +- src/Mod/Assembly/Gui/CMakeLists.txt | 3 +- src/Mod/Cam/App/CMakeLists.txt | 3 +- src/Mod/Cam/CMakeLists.txt | 2 +- src/Mod/Cam/Gui/CMakeLists.txt | 3 +- src/Mod/Complete/App/CMakeLists.txt | 3 +- src/Mod/Complete/CMakeLists.txt | 2 +- src/Mod/Complete/Gui/CMakeLists.txt | 1 + src/Mod/Draft/CMakeLists.txt | 6 +-- src/Mod/Drawing/App/CMakeLists.txt | 3 +- src/Mod/Drawing/CMakeLists.txt | 2 +- src/Mod/Drawing/Gui/CMakeLists.txt | 3 +- src/Mod/Fem/App/CMakeLists.txt | 3 +- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/Gui/CMakeLists.txt | 3 +- src/Mod/Idf/CMakeLists.txt | 10 ++-- src/Mod/Image/App/CMakeLists.txt | 3 +- src/Mod/Image/CMakeLists.txt | 2 +- src/Mod/Image/Gui/CMakeLists.txt | 3 +- src/Mod/Import/App/CMakeLists.txt | 4 ++ src/Mod/Import/CMakeLists.txt | 4 +- src/Mod/Import/Gui/CMakeLists.txt | 3 +- src/Mod/Inspection/App/CMakeLists.txt | 5 +- src/Mod/Inspection/CMakeLists.txt | 2 +- src/Mod/Inspection/Gui/CMakeLists.txt | 47 ++++++++++--------- src/Mod/Machining_Distortion/CMakeLists.txt | 3 +- src/Mod/Mesh/App/CMakeLists.txt | 3 +- src/Mod/Mesh/CMakeLists.txt | 2 +- src/Mod/Mesh/Gui/CMakeLists.txt | 3 +- src/Mod/MeshPart/App/CMakeLists.txt | 3 +- src/Mod/MeshPart/CMakeLists.txt | 2 +- src/Mod/MeshPart/Gui/CMakeLists.txt | 3 +- src/Mod/Part/App/CMakeLists.txt | 3 +- src/Mod/Part/CMakeLists.txt | 2 +- src/Mod/Part/Gui/CMakeLists.txt | 3 +- src/Mod/PartDesign/App/CMakeLists.txt | 3 +- src/Mod/PartDesign/CMakeLists.txt | 2 +- src/Mod/PartDesign/Gui/CMakeLists.txt | 3 +- src/Mod/Points/App/CMakeLists.txt | 3 +- src/Mod/Points/CMakeLists.txt | 2 +- src/Mod/Points/Gui/CMakeLists.txt | 3 +- src/Mod/Raytracing/App/CMakeLists.txt | 3 +- src/Mod/Raytracing/CMakeLists.txt | 2 +- src/Mod/Raytracing/Gui/CMakeLists.txt | 3 +- src/Mod/ReverseEngineering/App/CMakeLists.txt | 3 +- src/Mod/ReverseEngineering/CMakeLists.txt | 2 +- src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 3 ++ src/Mod/Robot/App/CMakeLists.txt | 3 +- src/Mod/Robot/CMakeLists.txt | 2 +- src/Mod/Robot/Gui/CMakeLists.txt | 3 +- src/Mod/Sandbox/App/CMakeLists.txt | 3 +- src/Mod/Sandbox/CMakeLists.txt | 12 ++--- src/Mod/Sandbox/Gui/CMakeLists.txt | 3 +- src/Mod/Sketcher/App/CMakeLists.txt | 3 +- src/Mod/Sketcher/CMakeLists.txt | 2 +- src/Mod/Sketcher/Gui/CMakeLists.txt | 3 +- src/Mod/Start/App/CMakeLists.txt | 3 +- src/Mod/Start/CMakeLists.txt | 3 +- src/Mod/Start/Gui/CMakeLists.txt | 3 +- src/Mod/TemplatePyMod/CMakeLists.txt | 21 +++++---- src/Mod/Test/CMakeLists.txt | 2 +- src/Mod/Test/Gui/CMakeLists.txt | 3 +- src/Mod/Web/CMakeLists.txt | 2 +- src/Mod/Web/Gui/CMakeLists.txt | 3 +- 74 files changed, 195 insertions(+), 129 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a14f81c9ad..4fccee3948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,11 +61,12 @@ endif(CMAKE_COMPILER_IS_GNUCXX) if(WIN32) SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) else(WIN32) -# SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad") + SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad") + SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif(WIN32) -# ================================================================================ -# == Win32 is default behaviour use the LibPack copied in Source tree ============ +# ============================================================================== +# == Win32 is default behaviour use the LibPack copied in Source tree ========== if(MSVC) OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON) set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack") @@ -74,7 +75,7 @@ else(MSVC) set(FREECAD_LIBPACK_DIR "" CACHE PATH "Directory of the FreeCAD LibPack") endif(MSVC) -# ================================================================================ +# ============================================================================== # == All the options for the build process ============ OPTION(FREECAD_BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON) @@ -82,10 +83,10 @@ OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3 OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF) OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON) OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF) +SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.") +SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.") - - -# ================================================================================ +# ============================================================================== if(FREECAD_LIBPACK_USE) # checking for a unique file in LibPack location to make sure the right version of the LibPack is there diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 728160eb45..0e3fadc438 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -12,7 +12,7 @@ ADD_CUSTOM_TARGET(Example_data ALL fc_copy_sources("data/examples" "Examples" ${Examples_Files}) -install( +INSTALL( FILES ${Examples_Files} DESTINATION diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 05822ec1e5..314632396f 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -197,12 +197,17 @@ ENDIF(MINGW) SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}) IF(UNIX) - # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 - INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV + SET_TARGET_PROPERTIES(SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH StdMeshers - DESTINATION lib) - # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 - INSTALL(DIRECTORY inc/ + PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) + # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 + INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV + SMESHDS SMESH StdMeshers + DESTINATION lib + ) + # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 + INSTALL(DIRECTORY inc/ DESTINATION include - FILES_MATCHING PATTERN "*.h*") + FILES_MATCHING PATTERN "*.h*" + ) ENDIF(UNIX) diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index 4195354d39..027fcf38eb 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -3,6 +3,14 @@ if(WIN32) add_definitions(-DBOOST_DYN_LINK) endif(WIN32) +IF(RESOURCEDIR) + add_definitions(-DRESOURCEDIR="${RESOURCEDIR}") +ENDIF(RESOURCEDIR) + +IF(DOCDIR) + add_definitions(-DDOCDIR="${DOCDIR}") +ENDIF(DOCDIR) + include_directories( ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src @@ -176,6 +184,7 @@ elseif(MINGW) set_target_properties(FreeCADApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) else(MSVC) set_target_properties(FreeCADApp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADApp PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) @@ -184,7 +193,7 @@ if(WIN32) LIBRARY DESTINATION lib ) else(WIN32) - INSTALL(TARGETS FreeCADApp + INSTALL(TARGETS FreeCADApp LIBRARY DESTINATION lib ) endif(WIN32) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 458fcf6517..10cd30b501 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -306,6 +306,7 @@ elseif(MINGW) set_target_properties(FreeCADBase PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) else(MSVC) set_target_properties(FreeCADBase PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADBase PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt index 8cce3d3b16..46fdb57b0e 100644 --- a/src/Doc/CMakeLists.txt +++ b/src/Doc/CMakeLists.txt @@ -1,5 +1,5 @@ find_package(Doxygen) -if( DOXYGEN_FOUND) +if(DOXYGEN_FOUND) IF (DOXYGEN_DOT_EXECUTABLE) SET(HAVE_DOT YES) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 62fbc91b6e..96d196a61e 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -835,6 +835,7 @@ elseif(MINGW) set_target_properties(FreeCADGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) else(MSVC) set_target_properties(FreeCADGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 4730dc82ed..c2ad84a875 100644 --- a/src/Main/CMakeLists.txt +++ b/src/Main/CMakeLists.txt @@ -59,6 +59,7 @@ if(FREECAD_BUILD_GUI) else(MSVC) set_target_properties(FreeCADMain PROPERTIES OUTPUT_NAME "FreeCAD") set_target_properties(FreeCADMain PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(FreeCADMain PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) @@ -99,6 +100,7 @@ elseif(MINGW) else(MSVC) set_target_properties(FreeCADMainCmd PROPERTIES OUTPUT_NAME "FreeCADCmd") set_target_properties(FreeCADMainCmd PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(FreeCADMainCmd PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) @@ -140,6 +142,7 @@ else(MSVC) set_target_properties(FreeCADMainPy PROPERTIES OUTPUT_NAME "FreeCAD") set_target_properties(FreeCADMainPy PROPERTIES PREFIX "") set_target_properties(FreeCADMainPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADMainPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) @@ -178,10 +181,12 @@ if(FREECAD_BUILD_GUI) set_target_properties(FreeCADGuiPy PROPERTIES SUFFIX ".pyd") set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") set_target_properties(FreeCADGuiPy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) else(MSVC) set_target_properties(FreeCADGuiPy PROPERTIES OUTPUT_NAME "FreeCADGui") set_target_properties(FreeCADGuiPy PROPERTIES PREFIX "") set_target_properties(FreeCADGuiPy PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set_target_properties(FreeCADGuiPy PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) endif(MSVC) if(WIN32) @@ -194,4 +199,4 @@ if(FREECAD_BUILD_GUI) LIBRARY DESTINATION lib ) endif(WIN32) -endif(FREECAD_BUILD_GUI) \ No newline at end of file +endif(FREECAD_BUILD_GUI) diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt index 63ea6d6c68..6d03814c95 100644 --- a/src/Mod/Arch/CMakeLists.txt +++ b/src/Mod/Arch/CMakeLists.txt @@ -30,9 +30,7 @@ ADD_CUSTOM_TARGET(Arch ALL fc_copy_sources("Mod/Arch" "Arch" ${all_files}) -install( - FILES - ${Arch_SRCS} - DESTINATION - Mod/Arch +INSTALL( + FILES ${Arch_SRCS} + DESTINATION Mod/Arch ) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index c447c90e8e..65d1a8ad4f 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -38,6 +38,7 @@ elseif(MINGW) 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) -install(TARGETS Assembly DESTINATION lib) +INSTALL(TARGETS Assembly DESTINATION lib) diff --git a/src/Mod/Assembly/CMakeLists.txt b/src/Mod/Assembly/CMakeLists.txt index 66690c6ddd..d586e7ae37 100644 --- a/src/Mod/Assembly/CMakeLists.txt +++ b/src/Mod/Assembly/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index f49f99e27c..9a734ffd3c 100644 --- a/src/Mod/Assembly/Gui/CMakeLists.txt +++ b/src/Mod/Assembly/Gui/CMakeLists.txt @@ -48,6 +48,7 @@ elseif(MINGW) 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) -install(TARGETS AssemblyGui DESTINATION lib) +INSTALL(TARGETS AssemblyGui DESTINATION lib) diff --git a/src/Mod/Cam/App/CMakeLists.txt b/src/Mod/Cam/App/CMakeLists.txt index 1e5e520caf..3080a60dc6 100644 --- a/src/Mod/Cam/App/CMakeLists.txt +++ b/src/Mod/Cam/App/CMakeLists.txt @@ -103,6 +103,7 @@ elseif(MINGW) 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) -install(TARGETS Cam DESTINATION lib) +INSTALL(TARGETS Cam DESTINATION lib) diff --git a/src/Mod/Cam/CMakeLists.txt b/src/Mod/Cam/CMakeLists.txt index 2c5120d35a..c04cfbdb09 100644 --- a/src/Mod/Cam/CMakeLists.txt +++ b/src/Mod/Cam/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Cam/Gui/CMakeLists.txt b/src/Mod/Cam/Gui/CMakeLists.txt index ce6b66f60d..dd86a49402 100644 --- a/src/Mod/Cam/Gui/CMakeLists.txt +++ b/src/Mod/Cam/Gui/CMakeLists.txt @@ -80,6 +80,7 @@ elseif(MINGW) 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) -install(TARGETS CamGui DESTINATION lib) +INSTALL(TARGETS CamGui DESTINATION lib) diff --git a/src/Mod/Complete/App/CMakeLists.txt b/src/Mod/Complete/App/CMakeLists.txt index ed95cebd61..09cc9db4a4 100644 --- a/src/Mod/Complete/App/CMakeLists.txt +++ b/src/Mod/Complete/App/CMakeLists.txt @@ -38,6 +38,7 @@ elseif(MINGW) 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) -install(TARGETS Complete DESTINATION lib) +INSTALL(TARGETS Complete DESTINATION lib) diff --git a/src/Mod/Complete/CMakeLists.txt b/src/Mod/Complete/CMakeLists.txt index 2524bc7669..1d74f0afa7 100644 --- a/src/Mod/Complete/CMakeLists.txt +++ b/src/Mod/Complete/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Complete/Gui/CMakeLists.txt b/src/Mod/Complete/Gui/CMakeLists.txt index 5a15d35898..5a386d7d5f 100644 --- a/src/Mod/Complete/Gui/CMakeLists.txt +++ b/src/Mod/Complete/Gui/CMakeLists.txt @@ -44,6 +44,7 @@ elseif(MINGW) 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) install(TARGETS CompleteGui DESTINATION lib) diff --git a/src/Mod/Draft/CMakeLists.txt b/src/Mod/Draft/CMakeLists.txt index ad493baf33..9ce900bfb5 100644 --- a/src/Mod/Draft/CMakeLists.txt +++ b/src/Mod/Draft/CMakeLists.txt @@ -34,14 +34,14 @@ ADD_CUSTOM_TARGET(Draft ALL fc_copy_sources("Mod/Draft" "Draft" ${all_files}) -install( + +INSTALL( FILES ${DraftLibs_SRCS} DESTINATION Mod/Draft/draftlibs ) - -install( +INSTALL( FILES ${Draft_SRCS} DESTINATION diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 0bc1213072..dfdb955c3b 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -85,6 +85,7 @@ elseif(MINGW) 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) +INSTALL(TARGETS Drawing DESTINATION lib) diff --git a/src/Mod/Drawing/CMakeLists.txt b/src/Mod/Drawing/CMakeLists.txt index b05efbc980..449046bd5d 100644 --- a/src/Mod/Drawing/CMakeLists.txt +++ b/src/Mod/Drawing/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index b8f41c034a..1f5326fa4f 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -103,6 +103,7 @@ elseif(MINGW) 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) -install(TARGETS DrawingGui DESTINATION lib) +INSTALL(TARGETS DrawingGui DESTINATION lib) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 353a169932..97b2df0e2b 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -79,6 +79,7 @@ elseif(MINGW) 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) -install(TARGETS Fem DESTINATION lib) +INSTALL(TARGETS Fem DESTINATION lib) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 61a77f9ba6..2122e87171 100644 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 8d4af1fcd5..abdd2fd2a3 100644 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -66,6 +66,7 @@ elseif(MINGW) 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) -install(TARGETS FemGui DESTINATION lib) +INSTALL(TARGETS FemGui DESTINATION lib) diff --git a/src/Mod/Idf/CMakeLists.txt b/src/Mod/Idf/CMakeLists.txt index 78a85ae8b2..7e0e8062a4 100644 --- a/src/Mod/Idf/CMakeLists.txt +++ b/src/Mod/Idf/CMakeLists.txt @@ -48,23 +48,21 @@ ADD_CUSTOM_TARGET(Idf ALL fc_copy_sources("Mod/Idf" "Idf" ${all_files}) -install( +INSTALL( FILES ${IdfLibs_SRCS} DESTINATION Mod/Idf/Idflibs ) - -install( +INSTALL( FILES ${IdfLang_SRCS} DESTINATION Mod/Idf/Languages ) - -install( +INSTALL( FILES ${Idf_SRCS} DESTINATION Mod/Idf - ) +) diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt index c5caa0bd9a..708947e793 100644 --- a/src/Mod/Image/App/CMakeLists.txt +++ b/src/Mod/Image/App/CMakeLists.txt @@ -44,6 +44,7 @@ elseif(MINGW) 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) -install(TARGETS Image DESTINATION lib) +INSTALL(TARGETS Image DESTINATION lib) diff --git a/src/Mod/Image/CMakeLists.txt b/src/Mod/Image/CMakeLists.txt index 20970fc14e..1aff167197 100644 --- a/src/Mod/Image/CMakeLists.txt +++ b/src/Mod/Image/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index d8b6468e62..c4af482fc6 100644 --- a/src/Mod/Image/Gui/CMakeLists.txt +++ b/src/Mod/Image/Gui/CMakeLists.txt @@ -69,6 +69,7 @@ elseif(MINGW) 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) -install(TARGETS ImageGui DESTINATION lib) +INSTALL(TARGETS ImageGui DESTINATION lib) diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index a6cb52d0e1..1ac7c717ab 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -42,4 +42,8 @@ target_link_libraries(Import ${Import_LIBS}) set_target_properties(Import PROPERTIES SUFFIX ".pyd") +if(UNIX) + set_target_properties(Import PROPERTIES INSTALL_RPATH ${INSTALL_RPATH}) +endif(UNIX) + install(TARGETS Import DESTINATION lib) diff --git a/src/Mod/Import/CMakeLists.txt b/src/Mod/Import/CMakeLists.txt index 72e7144c78..ec05f46d18 100644 --- a/src/Mod/Import/CMakeLists.txt +++ b/src/Mod/Import/CMakeLists.txt @@ -4,10 +4,10 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py DESTINATION Mod/Import -) +) diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index 215ea0a14d..5068a8b85a 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -56,6 +56,7 @@ elseif(MINGW) 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) +INSTALL(TARGETS ImportGui DESTINATION lib) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index f1d82a64c7..6c68175b72 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -50,6 +50,7 @@ elseif(MINGW) 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) - -install(TARGETS Inspection DESTINATION lib) + +INSTALL(TARGETS Inspection DESTINATION lib) diff --git a/src/Mod/Inspection/CMakeLists.txt b/src/Mod/Inspection/CMakeLists.txt index 56b56e2326..8e0f1c8e8e 100644 --- a/src/Mod/Inspection/CMakeLists.txt +++ b/src/Mod/Inspection/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index 1c78f7431c..103f80456b 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/src/Mod/Inspection/Gui/CMakeLists.txt @@ -47,26 +47,27 @@ SET(InspectionGui_SRCS ViewProviderInspection.cpp ViewProviderInspection.h Workbench.cpp - Workbench.h -) - -add_library(InspectionGui SHARED ${InspectionGui_SRCS}) -target_link_libraries(InspectionGui ${InspectionGui_LIBS}) -fc_copy_script("Mod/Inspection" "InspectionGui" 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 "") -endif(MSVC) - -install(TARGETS InspectionGui DESTINATION lib) + Workbench.h +) + +add_library(InspectionGui SHARED ${InspectionGui_SRCS}) +target_link_libraries(InspectionGui ${InspectionGui_LIBS}) +fc_copy_script("Mod/Inspection" "InspectionGui" 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) + +INSTALL(TARGETS InspectionGui DESTINATION lib) diff --git a/src/Mod/Machining_Distortion/CMakeLists.txt b/src/Mod/Machining_Distortion/CMakeLists.txt index d9adad2125..fa2cad73c3 100644 --- a/src/Mod/Machining_Distortion/CMakeLists.txt +++ b/src/Mod/Machining_Distortion/CMakeLists.txt @@ -21,7 +21,8 @@ ADD_CUSTOM_TARGET(MachDistortion ALL fc_copy_sources("Mod/Machining_Distortion" ${MachDist_SRCS}) -install( + +INSTALL( FILES ${MachDist_SRCS} DESTINATION diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index 3a30432040..f267429e0e 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -347,6 +347,7 @@ elseif(MINGW) 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) -install(TARGETS Mesh DESTINATION lib) +INSTALL(TARGETS Mesh DESTINATION lib) diff --git a/src/Mod/Mesh/CMakeLists.txt b/src/Mod/Mesh/CMakeLists.txt index 02fc9b2f66..67bd20a682 100644 --- a/src/Mod/Mesh/CMakeLists.txt +++ b/src/Mod/Mesh/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 8020c52833..8d17921ab2 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -124,6 +124,7 @@ elseif(MINGW) 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) -install(TARGETS MeshGui DESTINATION lib) +INSTALL(TARGETS MeshGui DESTINATION lib) diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 810d050cfb..a9e46eaf8d 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -66,6 +66,7 @@ elseif(MINGW) 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) -install(TARGETS MeshPart DESTINATION lib) +INSTALL(TARGETS MeshPart DESTINATION lib) diff --git a/src/Mod/MeshPart/CMakeLists.txt b/src/Mod/MeshPart/CMakeLists.txt index a3fc843f1d..70b320b0c6 100644 --- a/src/Mod/MeshPart/CMakeLists.txt +++ b/src/Mod/MeshPart/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 2c3257b0f4..2a9b603a82 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -69,6 +69,7 @@ elseif(MINGW) 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) -install(TARGETS MeshPartGui DESTINATION lib) +INSTALL(TARGETS MeshPartGui DESTINATION lib) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 51065d405d..d24476215c 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -254,6 +254,7 @@ elseif(MINGW) 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) +INSTALL(TARGETS Part DESTINATION lib) diff --git a/src/Mod/Part/CMakeLists.txt b/src/Mod/Part/CMakeLists.txt index f853b8701e..3f9ac4f8c1 100644 --- a/src/Mod/Part/CMakeLists.txt +++ b/src/Mod/Part/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index cadc2fcf59..0626ca7491 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -178,6 +178,7 @@ elseif(MINGW) 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) -install(TARGETS PartGui DESTINATION lib) +INSTALL(TARGETS PartGui DESTINATION lib) diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 200020926f..0a87bd07de 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -105,6 +105,7 @@ elseif(MINGW) 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 ${INSTALL_RPATH}) endif(MSVC) -install(TARGETS PartDesign DESTINATION lib) +INSTALL(TARGETS PartDesign DESTINATION lib) diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt index 72b602131d..3a7a0cc482 100644 --- a/src/Mod/PartDesign/CMakeLists.txt +++ b/src/Mod/PartDesign/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index b9cf3a3fa6..d12d2d923c 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -134,6 +134,7 @@ elseif(MINGW) 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 ${INSTALL_RPATH}) endif(MSVC) -install(TARGETS PartDesignGui DESTINATION lib) +INSTALL(TARGETS PartDesignGui DESTINATION lib) diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index 6085f3bc4a..ef411469cb 100644 --- a/src/Mod/Points/App/CMakeLists.txt +++ b/src/Mod/Points/App/CMakeLists.txt @@ -59,6 +59,7 @@ elseif(MINGW) 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) -install(TARGETS Points DESTINATION lib) +INSTALL(TARGETS Points DESTINATION lib) diff --git a/src/Mod/Points/CMakeLists.txt b/src/Mod/Points/CMakeLists.txt index b075bf0b0a..ddc7da06b3 100644 --- a/src/Mod/Points/CMakeLists.txt +++ b/src/Mod/Points/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index e091917dbb..60a59bcda4 100644 --- a/src/Mod/Points/Gui/CMakeLists.txt +++ b/src/Mod/Points/Gui/CMakeLists.txt @@ -69,6 +69,7 @@ elseif(MINGW) 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) -install(TARGETS PointsGui DESTINATION lib) +INSTALL(TARGETS PointsGui DESTINATION lib) diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt index 3c0bb51f20..2ee33c178e 100644 --- a/src/Mod/Raytracing/App/CMakeLists.txt +++ b/src/Mod/Raytracing/App/CMakeLists.txt @@ -74,6 +74,7 @@ elseif(MINGW) 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) -install(TARGETS Raytracing DESTINATION lib) +INSTALL(TARGETS Raytracing DESTINATION lib) diff --git a/src/Mod/Raytracing/CMakeLists.txt b/src/Mod/Raytracing/CMakeLists.txt index 119dd4f4e1..9cb6bec71d 100644 --- a/src/Mod/Raytracing/CMakeLists.txt +++ b/src/Mod/Raytracing/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt index 72ea6f515a..7b0b55457c 100644 --- a/src/Mod/Raytracing/Gui/CMakeLists.txt +++ b/src/Mod/Raytracing/Gui/CMakeLists.txt @@ -89,6 +89,7 @@ elseif(MINGW) 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) -install(TARGETS RaytracingGui DESTINATION lib) +INSTALL(TARGETS RaytracingGui DESTINATION lib) diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 7f177e9ccd..f4256a8785 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -47,6 +47,7 @@ elseif(MINGW) 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) -install(TARGETS ReverseEngineering DESTINATION lib) +INSTALL(TARGETS ReverseEngineering DESTINATION lib) diff --git a/src/Mod/ReverseEngineering/CMakeLists.txt b/src/Mod/ReverseEngineering/CMakeLists.txt index dbd56c1e09..85256fe058 100644 --- a/src/Mod/ReverseEngineering/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 6154bfa515..a60b0ba906 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -54,6 +54,9 @@ elseif(MINGW) 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) install(TARGETS ReverseEngineeringGui DESTINATION lib) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 0693cadd4f..1438841e39 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -137,6 +137,7 @@ elseif(MINGW) 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) -install(TARGETS Robot DESTINATION lib) +INSTALL(TARGETS Robot DESTINATION lib) diff --git a/src/Mod/Robot/CMakeLists.txt b/src/Mod/Robot/CMakeLists.txt index b1389e4ce7..fb292b6874 100644 --- a/src/Mod/Robot/CMakeLists.txt +++ b/src/Mod/Robot/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 2eec790d3f..afef07a61c 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -162,6 +162,7 @@ elseif(MINGW) 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) -install(TARGETS RobotGui DESTINATION lib) +INSTALL(TARGETS RobotGui DESTINATION lib) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 04ead0093d..88e3c558d1 100644 --- a/src/Mod/Sandbox/App/CMakeLists.txt +++ b/src/Mod/Sandbox/App/CMakeLists.txt @@ -46,6 +46,7 @@ elseif(MINGW) 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) -install(TARGETS Sandbox DESTINATION lib) +INSTALL(TARGETS Sandbox DESTINATION lib) diff --git a/src/Mod/Sandbox/CMakeLists.txt b/src/Mod/Sandbox/CMakeLists.txt index 208ada7576..3e476d5aef 100644 --- a/src/Mod/Sandbox/CMakeLists.txt +++ b/src/Mod/Sandbox/CMakeLists.txt @@ -4,10 +4,10 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( - FILES - Init.py - InitGui.py - DESTINATION - Mod/Sandbox +INSTALL( + FILES + Init.py + InitGui.py + DESTINATION + Mod/Sandbox ) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index dfebaef874..5549b23e90 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -57,6 +57,7 @@ elseif(MINGW) 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) -install(TARGETS SandboxGui DESTINATION lib) +INSTALL(TARGETS SandboxGui DESTINATION lib) diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index a0584761c3..9acc4d2cb3 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -121,6 +121,7 @@ elseif(MINGW) 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) -install(TARGETS Sketcher DESTINATION lib) +INSTALL(TARGETS Sketcher DESTINATION lib) diff --git a/src/Mod/Sketcher/CMakeLists.txt b/src/Mod/Sketcher/CMakeLists.txt index 6f0ff9b7a9..9966c52ba8 100644 --- a/src/Mod/Sketcher/CMakeLists.txt +++ b/src/Mod/Sketcher/CMakeLists.txt @@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 743f7eee6b..f5ad36ab64 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -113,6 +113,7 @@ elseif(MINGW) 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) -install(TARGETS SketcherGui DESTINATION lib) +INSTALL(TARGETS SketcherGui DESTINATION lib) diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index 858d737c9e..0a56332a89 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -37,6 +37,7 @@ elseif(MINGW) 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) -install(TARGETS Start DESTINATION lib) +INSTALL(TARGETS Start DESTINATION lib) diff --git a/src/Mod/Start/CMakeLists.txt b/src/Mod/Start/CMakeLists.txt index e4d4bc543d..0330776ccc 100644 --- a/src/Mod/Start/CMakeLists.txt +++ b/src/Mod/Start/CMakeLists.txt @@ -2,9 +2,10 @@ add_subdirectory(App) if(FREECAD_BUILD_GUI) add_subdirectory(Gui) + add_subdirectory(StartPage) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 6361f4cb22..13329d4d0a 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -70,6 +70,7 @@ elseif(MINGW) 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) -install(TARGETS StartGui DESTINATION lib) +INSTALL(TARGETS StartGui DESTINATION lib) diff --git a/src/Mod/TemplatePyMod/CMakeLists.txt b/src/Mod/TemplatePyMod/CMakeLists.txt index c8f4eda866..374925ad18 100644 --- a/src/Mod/TemplatePyMod/CMakeLists.txt +++ b/src/Mod/TemplatePyMod/CMakeLists.txt @@ -9,13 +9,14 @@ fc_copy_to_mod_path("TemplatePyMod" DocumentObject.py ) -install( - FILES - Init.py - InitGui.py - Commands.py - FeaturePython.py - PythonQt.py - Tests.py - DESTINATION - Mod/TemplatePyMod) +INSTALL( + FILES + Init.py + InitGui.py + Commands.py + FeaturePython.py + PythonQt.py + Tests.py + DESTINATION + Mod/TemplatePyMod +) diff --git a/src/Mod/Test/CMakeLists.txt b/src/Mod/Test/CMakeLists.txt index fdd017d052..ec02a28053 100644 --- a/src/Mod/Test/CMakeLists.txt +++ b/src/Mod/Test/CMakeLists.txt @@ -20,7 +20,7 @@ ADD_CUSTOM_TARGET(Test ALL fc_copy_sources("Mod/Test" "Test" ${Test_SRCS}) -install( +INSTALL( FILES ${Test_SRCS} DESTINATION diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index 52c3fa572a..4ec2b53c51 100644 --- a/src/Mod/Test/Gui/CMakeLists.txt +++ b/src/Mod/Test/Gui/CMakeLists.txt @@ -65,6 +65,7 @@ elseif(MINGW) 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) -install(TARGETS QtUnitGui DESTINATION lib) +INSTALL(TARGETS QtUnitGui DESTINATION lib) diff --git a/src/Mod/Web/CMakeLists.txt b/src/Mod/Web/CMakeLists.txt index ae318b8b9b..2280944107 100644 --- a/src/Mod/Web/CMakeLists.txt +++ b/src/Mod/Web/CMakeLists.txt @@ -3,7 +3,7 @@ if(FREECAD_BUILD_GUI) add_subdirectory(Gui) endif(FREECAD_BUILD_GUI) -install( +INSTALL( FILES Init.py InitGui.py diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index 9906c815ed..70747a1d4c 100644 --- a/src/Mod/Web/Gui/CMakeLists.txt +++ b/src/Mod/Web/Gui/CMakeLists.txt @@ -52,6 +52,7 @@ elseif(MINGW) 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) -install(TARGETS WebGui DESTINATION lib) +INSTALL(TARGETS WebGui DESTINATION lib)