diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-06 22:31:13 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-06-06 23:20:42 +0000 |
| commit | 47ba544abac1dc54a73a44b2b8eec45d92cb83a1 (patch) | |
| tree | 3d6b999d853917e60cc6b1d842d9a534b0aa3e82 /CMakeScripts/ConfigPaths.cmake | |
| parent | Fix build (loading icon). (diff) | |
| download | inkscape-47ba544abac1dc54a73a44b2b8eec45d92cb83a1.tar.gz inkscape-47ba544abac1dc54a73a44b2b8eec45d92cb83a1.zip | |
Use share/inkscape subfolder on Windows
First part of https://gitlab.com/inkscape/inkscape/issues/82
Diffstat (limited to 'CMakeScripts/ConfigPaths.cmake')
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 46b48cb75..41811b013 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -7,24 +7,15 @@ if(WIN32) endif() set(INKSCAPE_DATADIR "") # can be set via the environment variable INKSCAPE_DATADIR at runtime - - 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() set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") +endif() - if(NOT PACKAGE_LOCALE_DIR) - set(PACKAGE_LOCALE_DIR "share/locale") # packagers might overwrite this - endif(NOT PACKAGE_LOCALE_DIR) - - 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") +if(NOT PACKAGE_LOCALE_DIR) + set(PACKAGE_LOCALE_DIR "share/locale") # packagers might overwrite this +endif(NOT PACKAGE_LOCALE_DIR) - mark_as_advanced(SHARE_INSTALL) -endif() +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") |