From 61b1ddd0599ee54f76494888524b156859134e85 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 26 Nov 2016 17:15:27 +0100 Subject: 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) --- CMakeScripts/ConfigPaths.cmake | 2 ++ CMakeScripts/Install.cmake | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeScripts') 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 -- cgit v1.2.3