=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2015-05-04 01:04:21 +0000 +++ CMakeLists.txt 2015-05-04 16:04:32 +0000 @@ -150,30 +150,11 @@ install( FILES ${CMAKE_BINARY_DIR}/inkscape.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications + DESTINATION ${SHARE_INSTALL}/applications ) - install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/share/attributes - ${CMAKE_SOURCE_DIR}/share/branding - ${CMAKE_SOURCE_DIR}/share/examples - ${CMAKE_SOURCE_DIR}/share/extensions - ${CMAKE_SOURCE_DIR}/share/filters - ${CMAKE_SOURCE_DIR}/share/fonts - ${CMAKE_SOURCE_DIR}/share/gradients - ${CMAKE_SOURCE_DIR}/share/icons - ${CMAKE_SOURCE_DIR}/share/keys - ${CMAKE_SOURCE_DIR}/share/markers - ${CMAKE_SOURCE_DIR}/share/palettes - ${CMAKE_SOURCE_DIR}/share/patterns - ${CMAKE_SOURCE_DIR}/share/screens - ${CMAKE_SOURCE_DIR}/share/symbols - ${CMAKE_SOURCE_DIR}/share/templates - ${CMAKE_SOURCE_DIR}/share/tutorials - ${CMAKE_SOURCE_DIR}/share/ui - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/inkscape - ) + # this should probably be done no matter what the platform is, just set SHARE_INSTALL first + add_subdirectory(share) else() # TODO, WIN32/APPLE === modified file 'CMakeScripts/ConfigPaths.cmake' --- CMakeScripts/ConfigPaths.cmake 2011-07-05 15:12:43 +0000 +++ CMakeScripts/ConfigPaths.cmake 2015-05-04 16:03:48 +0000 @@ -2,9 +2,15 @@ IF(WIN32) SET(PACKAGE_LOCALE_DIR "locale") -ELSEIF(WIN32) + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") +ELSE(WIN32) # TODO: check and change this to correct value: SET(PACKAGE_LOCALE_DIR "locale") + + if(NOT SHARE_INSTALL) + set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.") + endif(NOT SHARE_INSTALL) + mark_as_advanced(SHARE_INSTALL) ENDIF(WIN32) #SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) === added file 'share/CMakeLists.txt' --- share/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/CMakeLists.txt 2015-05-04 15:21:42 +0000 @@ -0,0 +1,17 @@ +add_subdirectory(attributes) +add_subdirectory(branding) +add_subdirectory(examples) +add_subdirectory(extensions) +add_subdirectory(filters) +add_subdirectory(fonts) +add_subdirectory(gradients) +add_subdirectory(icons) +add_subdirectory(keys) +add_subdirectory(markers) +add_subdirectory(palettes) +add_subdirectory(patterns) +add_subdirectory(screens) +add_subdirectory(symbols) +add_subdirectory(templates) +add_subdirectory(tutorials) +add_subdirectory(ui) \ No newline at end of file === added file 'share/attributes/CMakeLists.txt' --- share/attributes/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/attributes/CMakeLists.txt 2015-05-04 15:15:18 +0000 @@ -0,0 +1,2 @@ +set(_FILES "svgprops" "cssprops" "css_defaults" "README") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/attributes) === added file 'share/branding/CMakeLists.txt' --- share/branding/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/branding/CMakeLists.txt 2015-05-04 15:13:21 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "README" "*.svg") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) === added file 'share/examples/CMakeLists.txt' --- share/examples/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/examples/CMakeLists.txt 2015-05-04 15:14:48 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "README" "*.svg" "*.svgz" "*.pov") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/examples) === added file 'share/extensions/CMakeLists.txt' --- share/extensions/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/extensions/CMakeLists.txt 2015-05-04 15:22:26 +0000 @@ -0,0 +1,46 @@ +file(GLOB _FILES + "README" + "fontfix.conf" + "inkweb.js" + "jessyInk.js" + "jessyInk_core_mouseHandler_noclick.js" + "jessyInk_core_mouseHandler_zoomControl.js" + "aisvg.xslt" + "colors.xml" + "jessyInk_video.svg" + "seamless_pattern.svg" + "svg2fxg.xsl" + "svg2xaml.xsl" + "xaml2svg.xsl" + "inkscape.extension.rng" + "*.py" + "*.pl" + "*.sh" + "*.rb" + "*.inx" + ) +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions) + +file(GLOB _FILES "alphabet_soup/*.svg") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/alphabet_soup) + +file(GLOB _FILES "Barcode/*.py") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Barcode) + +file(GLOB _FILES "Poly3DObjects/*.obj") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Poly3DObjects) + +# file(GLOB _FILES +# "test/*.svg" +# "test/*.sh" +# "test/*.py" +# "test/*.js" +# "test/run-all-extension-tests" +# ) +# install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/test) + +file(GLOB _FILES "ink2canvas/*.py") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/ink2canvas) + +file(GLOB _FILES "xaml2svg/*.xsl") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/xaml2svg) === added file 'share/filters/CMakeLists.txt' --- share/filters/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/filters/CMakeLists.txt 2015-05-04 14:14:11 +0000 @@ -0,0 +1,10 @@ +add_custom_command( + OUTPUT filters.svg.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py +) +add_custom_target(filters.svg.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/filters) +install(FILES "filters.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/filters) === added file 'share/fonts/CMakeLists.txt' --- share/fonts/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/fonts/CMakeLists.txt 2015-05-04 15:16:08 +0000 @@ -0,0 +1,1 @@ +install(FILES "README" DESTINATION ${SHARE_INSTALL}/inkscape/fonts) === added file 'share/gradients/CMakeLists.txt' --- share/gradients/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/gradients/CMakeLists.txt 2015-05-04 15:16:50 +0000 @@ -0,0 +1,1 @@ +install(FILES "README" DESTINATION ${SHARE_INSTALL}/inkscape/gradients) === added file 'share/icons/CMakeLists.txt' --- share/icons/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/icons/CMakeLists.txt 2015-05-04 15:25:46 +0000 @@ -0,0 +1,6 @@ +add_subdirectory(application) + +file(GLOB _FILES "*.svg" "*.jpg" "*.png" "README") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/icons) + +install(FILES ../branding/inkscape.svg DESTINATION ${SHARE_INSTALL}/inkscape/icons) === added file 'share/icons/application/CMakeLists.txt' --- share/icons/application/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/icons/application/CMakeLists.txt 2015-05-04 15:52:55 +0000 @@ -0,0 +1,9 @@ +set(PIXMAP_SIZES "16x16" "22x22" "24x24" "32x32" "48x48" "256x256") +set(THEME hicolor) +foreach(pixmap_size ${PIXMAP_SIZES}) + FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/*.svg) + install(FILES ${PIXMAP_FILES} DESTINATION ${SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/apps) +endforeach(pixmap_size) + +# I hope that this is actually run after installing the files. +install(CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/icons/${THEME})") \ No newline at end of file === added file 'share/keys/CMakeLists.txt' --- share/keys/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/keys/CMakeLists.txt 2015-05-04 15:17:40 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "*.xml") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/keys) === added file 'share/markers/CMakeLists.txt' --- share/markers/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/markers/CMakeLists.txt 2015-05-04 15:18:13 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "*.svg") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/markers) === added file 'share/palettes/CMakeLists.txt' --- share/palettes/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/palettes/CMakeLists.txt 2015-05-04 14:56:27 +0000 @@ -0,0 +1,13 @@ +set(I18N_FILES "inkscape.gpl" "svg.gpl" "Tango-Palette.gpl") + +add_custom_command( + OUTPUT palettes.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/palettes.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} +) +add_custom_target(palettes.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/palettes.h) + +file(GLOB _FILES "*.gpl") + +install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/palettes.h DESTINATION ${SHARE_INSTALL}/inkscape/palettes) === added file 'share/patterns/CMakeLists.txt' --- share/patterns/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/patterns/CMakeLists.txt 2015-05-04 14:19:54 +0000 @@ -0,0 +1,10 @@ +add_custom_command( + OUTPUT patterns.svg.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py +) +add_custom_target(patterns.svg.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns) +install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns) \ No newline at end of file === added file 'share/screens/CMakeLists.txt' --- share/screens/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/screens/CMakeLists.txt 2015-05-04 15:19:16 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "README" "*.svg") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/screens) === added file 'share/symbols/CMakeLists.txt' --- share/symbols/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/symbols/CMakeLists.txt 2015-05-04 14:46:34 +0000 @@ -0,0 +1,11 @@ +file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg") + +add_custom_command( + OUTPUT symbols.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/symbols.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} +) +add_custom_target(symbols.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/symbols.h) + +install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/symbols.h DESTINATION ${SHARE_INSTALL}/inkscape/symbols) === added file 'share/templates/CMakeLists.txt' --- share/templates/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/templates/CMakeLists.txt 2015-05-04 14:51:34 +0000 @@ -0,0 +1,11 @@ +file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg") + +add_custom_command( + OUTPUT templates.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/templates.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} +) +add_custom_target(templates.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/templates.h) + +install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/templates.h DESTINATION ${SHARE_INSTALL}/inkscape/templates) === added file 'share/tutorials/CMakeLists.txt' --- share/tutorials/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/tutorials/CMakeLists.txt 2015-05-04 15:20:11 +0000 @@ -0,0 +1,2 @@ +file(GLOB _FILES "README" "*.svg" "*.jpg" "*.png") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/tutorials) === added file 'share/ui/CMakeLists.txt' --- share/ui/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ share/ui/CMakeLists.txt 2015-05-04 15:20:56 +0000 @@ -0,0 +1,3 @@ +file(GLOB _FILES "*.xml" "*.rc") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/ui) +