CMake: Add ${INKSCAPE_SHARE_INSTALL}

This is set to "share/inkscape" by default, on Windows we need to be able to install directly into "share" however

(bzr r15278)

20 files changed, 30 insertions, 32 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f51958c7a..efd6ff128 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,10 +186,7 @@ endif()
 # -----------------------------------------------------------------------------
 # Installation
 # -----------------------------------------------------------------------------
-#if(NOT WIN32)
-  # this should probably be done no matter what the platform is, just set SHARE_INSTALL first
-  add_subdirectory(share)
-#endif()
+add_subdirectory(share)
 	
 include(CMakeScripts/Install.cmake)
 
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 9489ba047..fae8ceea6 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -9,6 +9,7 @@ if(WIN32)
   set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
   
   set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
+  set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}") # share/inkscape goes directly into /share on Windows
   
   mark_as_advanced(SHARE_INSTALL)
 else()
@@ -23,6 +24,7 @@ else()
   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)
+  set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}/inkscape")
 
   mark_as_advanced(SHARE_INSTALL)
 endif()
\ No newline at end of file
diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
index f20979742..01db2644c 100644
--- a/CMakeScripts/Install.cmake
+++ b/CMakeScripts/Install.cmake
@@ -190,7 +190,6 @@ if(WIN32)
     doc

     modules

     plugins

-    share

     DESTINATION ${CMAKE_INSTALL_PREFIX}

     PATTERN hicolor/index.theme EXCLUDE   # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV.

     PATTERN CMakeLists.txt EXCLUDE

diff --git a/share/attributes/CMakeLists.txt b/share/attributes/CMakeLists.txt
index 9b6b0de0a..7235a5ef0 100644
--- a/share/attributes/CMakeLists.txt
+++ b/share/attributes/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(_FILES "svgprops" "cssprops" "css_defaults" "README")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/attributes)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/attributes)
diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt
index ae4aa6a14..cdff3a43a 100644
--- a/share/branding/CMakeLists.txt
+++ b/share/branding/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB _FILES "README" "*.svg")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/branding)
 
diff --git a/share/examples/CMakeLists.txt b/share/examples/CMakeLists.txt
index be73c5a87..4187f839e 100644
--- a/share/examples/CMakeLists.txt
+++ b/share/examples/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB _FILES "README" "*.svg" "*.svgz" "*.pov")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/examples)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/examples)
diff --git a/share/extensions/CMakeLists.txt b/share/extensions/CMakeLists.txt
index 74819309d..b311c6cbf 100644
--- a/share/extensions/CMakeLists.txt
+++ b/share/extensions/CMakeLists.txt
@@ -17,7 +17,7 @@ file(GLOB _FILES
       "*.inx"
     )
 
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions)
 
 # Install the executable scripts
 file(GLOB _SCRIPTS
@@ -27,16 +27,16 @@ file(GLOB _SCRIPTS
       "*.rb"
     )
 
-install(PROGRAMS ${_SCRIPTS} DESTINATION ${SHARE_INSTALL}/inkscape/extensions)
+install(PROGRAMS ${_SCRIPTS} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions)
 
 file(GLOB _FILES "alphabet_soup/*.svg")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/alphabet_soup)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/alphabet_soup)
 
 file(GLOB _FILES "Barcode/*.py")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Barcode)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/Barcode)
 
 file(GLOB _FILES "Poly3DObjects/*.obj")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Poly3DObjects)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/Poly3DObjects)
 
 # file(GLOB _FILES
 #       "test/*.svg"
@@ -45,10 +45,10 @@ install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Poly3DO
 #       "test/*.js"
 #       "test/run-all-extension-tests"
 #     )
-# install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/test)
+# install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/test)
 
 file(GLOB _FILES "ink2canvas/*.py")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/ink2canvas)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/ink2canvas)
 
 file(GLOB _FILES "xaml2svg/*.xsl")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/xaml2svg)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/xaml2svg)
diff --git a/share/filters/CMakeLists.txt b/share/filters/CMakeLists.txt
index c1c708d8e..4b2d2c2c9 100644
--- a/share/filters/CMakeLists.txt
+++ b/share/filters/CMakeLists.txt
@@ -8,5 +8,5 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/filters.svg.h PROPERTIES GENERAT
 
 add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/filters)
-install(FILES "filters.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/filters)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/filters)
+install(FILES "filters.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/filters)
diff --git a/share/fonts/CMakeLists.txt b/share/fonts/CMakeLists.txt
index d8d9e3684..42068f6e0 100644
--- a/share/fonts/CMakeLists.txt
+++ b/share/fonts/CMakeLists.txt
@@ -1 +1 @@
-install(FILES "README" DESTINATION ${SHARE_INSTALL}/inkscape/fonts)
+install(FILES "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/fonts)
diff --git a/share/gradients/CMakeLists.txt b/share/gradients/CMakeLists.txt
index ec5e388af..96640f52f 100644
--- a/share/gradients/CMakeLists.txt
+++ b/share/gradients/CMakeLists.txt
@@ -1 +1 @@
-install(FILES "README" DESTINATION ${SHARE_INSTALL}/inkscape/gradients)
+install(FILES "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/gradients)
diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt
index d4994a694..61bb2933e 100644
--- a/share/icons/CMakeLists.txt
+++ b/share/icons/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(application)
 
 file(GLOB _FILES "*.svg" "*.jpg" "*.png" "README")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/icons)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons)
 
-install(FILES ../branding/inkscape.svg DESTINATION ${SHARE_INSTALL}/inkscape/icons)
+install(FILES ../branding/inkscape.svg DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons)
diff --git a/share/keys/CMakeLists.txt b/share/keys/CMakeLists.txt
index e968007dc..c3a745ae8 100644
--- a/share/keys/CMakeLists.txt
+++ b/share/keys/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB _FILES "*.xml")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/keys)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/keys)
diff --git a/share/markers/CMakeLists.txt b/share/markers/CMakeLists.txt
index 410df1cf4..e5b4fe884 100644
--- a/share/markers/CMakeLists.txt
+++ b/share/markers/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB _FILES "*.svg")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/markers)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/markers)
diff --git a/share/palettes/CMakeLists.txt b/share/palettes/CMakeLists.txt
index a747ca798..f578db971 100644
--- a/share/palettes/CMakeLists.txt
+++ b/share/palettes/CMakeLists.txt
@@ -12,4 +12,4 @@ add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h)
 
 file(GLOB _FILES "*.gpl")
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h DESTINATION ${SHARE_INSTALL}/inkscape/palettes)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/palettes)
diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt
index 4f038ffc3..ff234e894 100644
--- a/share/patterns/CMakeLists.txt
+++ b/share/patterns/CMakeLists.txt
@@ -7,5 +7,5 @@ add_custom_command(
 set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE)
 add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
-install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns)
+install(FILES "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns)
diff --git a/share/screens/CMakeLists.txt b/share/screens/CMakeLists.txt
index b8b848708..e5fd5e847 100644
--- a/share/screens/CMakeLists.txt
+++ b/share/screens/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB _FILES "README" "*.svg")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/screens)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/screens)
diff --git a/share/symbols/CMakeLists.txt b/share/symbols/CMakeLists.txt
index c74552f04..c3d23affb 100644
--- a/share/symbols/CMakeLists.txt
+++ b/share/symbols/CMakeLists.txt
@@ -9,4 +9,4 @@ add_custom_command(
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/symbols.h PROPERTIES GENERATED TRUE)
 add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h)
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h DESTINATION ${SHARE_INSTALL}/inkscape/symbols)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/symbols)
diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt
index 3793ee44f..60dee719d 100644
--- a/share/templates/CMakeLists.txt
+++ b/share/templates/CMakeLists.txt
@@ -9,4 +9,4 @@ add_custom_command(
 set_source_files_properties(${CMAKE_SOURCE_DIR}/templates.h PROPERTIES GENERATED TRUE)
 add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/templates.h)
 
-install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/templates.h DESTINATION ${SHARE_INSTALL}/inkscape/templates)
+install(FILES ${_FILES} "README" ${CMAKE_CURRENT_SOURCE_DIR}/templates.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/templates)
diff --git a/share/tutorials/CMakeLists.txt b/share/tutorials/CMakeLists.txt
index f8491bf32..624e46387 100644
--- a/share/tutorials/CMakeLists.txt
+++ b/share/tutorials/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB _FILES "README" "*.svg" "*.jpg" "*.png")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/tutorials)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/tutorials)
diff --git a/share/ui/CMakeLists.txt b/share/ui/CMakeLists.txt
index 5e9db74cf..8cd974ad3 100644
--- a/share/ui/CMakeLists.txt
+++ b/share/ui/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(GLOB _FILES "*.xml" "*.rc" "*.css")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/ui)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/ui)