diff options
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/Install.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/Pod2man.cmake | 5 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 10 |
4 files changed, 16 insertions, 2 deletions
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/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake index 3189192de..21010fb33 100644 --- a/CMakeScripts/Pod2man.cmake +++ b/CMakeScripts/Pod2man.cmake @@ -28,10 +28,12 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) set(MANPAGE_TARGET "man-${NAME}-${LANG}") set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.tmp") set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.${SECTION}") + set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/${LANG}/man${SECTION}") else() set(MANPAGE_TARGET "man-${NAME}") set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.tmp") set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${SECTION}") + set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}") endif() add_custom_command( OUTPUT ${MANFILE_TEMP} @@ -48,7 +50,8 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) ) install( FILES ${MANFILE_FULL} - DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION} + RENAME ${NAME}.${SECTION} + DESTINATION ${MANFILE_DEST} ) endif() endmacro(pod2man PODFILE NAME SECTION CENTER) diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2155e0013..11316101f 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -7,13 +7,23 @@ # We should extract the version from build.xml # but for now just hard code + set(INKSCAPE_REVISION "unknown") +set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) execute_process(COMMAND bzr revno --tree ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process(COMMAND + bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") + set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM}) + endif() endif() message("revision is " ${INKSCAPE_REVISION}) |