From c4122e059e07a8dd7c1b71174a3c09ae8d624087 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 16 Feb 2012 23:35:54 +0100 Subject: [PATCH] Fix INSTALL target in cmake files --- CMakeLists.txt | 7 +++++++ data/CMakeLists.txt | 8 ++++++++ data/examples/CMakeLists.txt | 3 ++- src/CMakeLists.txt | 5 +++++ src/Gui/CMakeLists.txt | 4 ++++ src/Mod/Drawing/CMakeLists.txt | 8 ++++++++ src/Mod/Raytracing/CMakeLists.txt | 9 +++++++++ src/Mod/Robot/CMakeLists.txt | 10 ++++++++++ src/Mod/Start/StartPage/CMakeLists.txt | 2 +- 9 files changed, 54 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 473349a60..c8c654cdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,13 @@ else(WIN32) SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif(WIN32) + +# Output directories for install target +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_DOCDIR doc CACHE PATH "Output directory for documentation and license files") + + # ============================================================================== # == Win32 is default behaviour use the LibPack copied in Source tree ========== if(MSVC) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2d2cfee5f..e5df8f597 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1 +1,9 @@ add_subdirectory(examples) + +INSTALL( + FILES + License.txt + DESTINATION + data +) + diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 0e3fadc43..8fb5b72d5 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -2,6 +2,7 @@ SET(Examples_Files Schenkel.stp DrawingExample.FCStd + EngineBlock.FCStd PartDesignExample.FCStd RobotExample.FCStd ) @@ -16,6 +17,6 @@ INSTALL( FILES ${Examples_Files} DESTINATION - data/examples + ${CMAKE_INSTALL_DATADIR}/examples ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a9e9915b3..2c8c233e9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,3 +19,8 @@ endif(FREECAD_BUILD_GUI) if(FREECAD_MAINTAINERS_BUILD AND WIN32) #add_subdirectory(WindowsInstaller) endif(FREECAD_MAINTAINERS_BUILD AND WIN32) + +INSTALL(FILES Doc/Start_Page.html Doc/freecad.qhc Doc/freecad.qch + DESTINATION ${CMAKE_INSTALL_DOCDIR} +) + diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index b0e8968b5..133d81a54 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -848,4 +848,8 @@ else(WIN32) INSTALL(TARGETS FreeCADGui LIBRARY DESTINATION lib ) + INSTALL(FILES Icons/freecad.xpm Icons/freecad-doc.png + DESTINATION ${CMAKE_INSTALL_DATADIR} + ) endif(WIN32) + diff --git a/src/Mod/Drawing/CMakeLists.txt b/src/Mod/Drawing/CMakeLists.txt index e41aa509c..23d46b5fa 100644 --- a/src/Mod/Drawing/CMakeLists.txt +++ b/src/Mod/Drawing/CMakeLists.txt @@ -14,3 +14,11 @@ INSTALL( DESTINATION Mod/Drawing ) + +INSTALL( + DIRECTORY + Templates + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Mod/Drawing + FILES_MATCHING PATTERN "*.svg*" +) diff --git a/src/Mod/Raytracing/CMakeLists.txt b/src/Mod/Raytracing/CMakeLists.txt index 42aa28ce3..416e7197a 100644 --- a/src/Mod/Raytracing/CMakeLists.txt +++ b/src/Mod/Raytracing/CMakeLists.txt @@ -12,3 +12,12 @@ INSTALL( DESTINATION Mod/Raytracing ) + +INSTALL( + DIRECTORY + Templates + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Mod/Raytracing + FILES_MATCHING PATTERN "*.pov*" +) + diff --git a/src/Mod/Robot/CMakeLists.txt b/src/Mod/Robot/CMakeLists.txt index 0850be036..750eb19bf 100644 --- a/src/Mod/Robot/CMakeLists.txt +++ b/src/Mod/Robot/CMakeLists.txt @@ -15,3 +15,13 @@ INSTALL( DESTINATION Mod/Robot ) + +INSTALL( + DIRECTORY + Lib + DESTINATION + ${CMAKE_INSTALL_DATADIR}/Mod/Robot + PATTERN "Makefile*" EXCLUDE + PATTERN "*.pdf" EXCLUDE +) + diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt index 624588115..b6ce8001b 100644 --- a/src/Mod/Start/StartPage/CMakeLists.txt +++ b/src/Mod/Start/StartPage/CMakeLists.txt @@ -27,6 +27,6 @@ SET(StartPage_DATA ) INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA} - DESTINATION Mod/Start/StartPage + DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage )