diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-07-08 11:36:33 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-07-08 11:36:33 +0000 |
| commit | e39ad9ca26ed5807959237e2400fdf1b70135005 (patch) | |
| tree | 6f4666fb5e214c9e05ac926edb4db0cfd5d07226 /CMakeScripts/ConfigPaths.cmake | |
| parent | Fix issues related to updating style content and selection of rows in treeview (diff) | |
| parent | Documentation. French documentation translation updated. (diff) | |
| download | inkscape-e39ad9ca26ed5807959237e2400fdf1b70135005.tar.gz inkscape-e39ad9ca26ed5807959237e2400fdf1b70135005.zip | |
Merge changes from trunk
(bzr r14949.1.41)
Diffstat (limited to '')
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 3b13a7734..9489ba047 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -1,16 +1,28 @@ message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}") if(WIN32) - set(PACKAGE_LOCALE_DIR "locale") + set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape") + + set(INKSCAPE_LIBDIR "\\\\lib") + set(INKSCAPE_DATADIR "") + + 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.") + + mark_as_advanced(SHARE_INSTALL) +else() + set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") + set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") + + # TODO: check and change this to correct value: + if(NOT PACKAGE_LOCALE_DIR) + set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/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.") -else(WIN32) - # TODO: check and change this to correct value: - if(NOT PACKAGE_LOCALE_DIR) - set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this - endif(NOT PACKAGE_LOCALE_DIR) + endif(NOT SHARE_INSTALL) - 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) + mark_as_advanced(SHARE_INSTALL) +endif()
\ No newline at end of file |