diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-04-12 09:10:40 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-04-12 09:10:40 +0000 |
| commit | 5d542ba036017af885913a6dd1f35b91daba047f (patch) | |
| tree | e78d874a6873ed1c42988cdbf147f12f1ef43509 /CMakeScripts | |
| parent | fix undo clip rendering bug (diff) | |
| download | inkscape-5d542ba036017af885913a6dd1f35b91daba047f.tar.gz inkscape-5d542ba036017af885913a6dd1f35b91daba047f.zip | |
regenerates inkscape-version when revno changes ; Translates inkscape.desktop file (CMake build)
Fixed bugs:
- https://launchpad.net/bugs/1543304
- https://launchpad.net/bugs/1514588
(bzr r14785)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/inkscape-desktop.cmake | 9 | ||||
| -rw-r--r-- | CMakeScripts/inkscape-version.cmake | 18 |
2 files changed, 11 insertions, 16 deletions
diff --git a/CMakeScripts/inkscape-desktop.cmake b/CMakeScripts/inkscape-desktop.cmake new file mode 100644 index 000000000..bf3b2b7b7 --- /dev/null +++ b/CMakeScripts/inkscape-desktop.cmake @@ -0,0 +1,9 @@ +# This is called by cmake as an extermal process from +# ./po/CMakeLists.txt and creates inkscape.desktop +# +# These variables are defined by the caller, matching the CMake equivilents. +# - ${INKSCAPE_SOURCE_DIR} +# - ${INKSCAPE_BINARY_DIR} +message("building inkscape.desktop") +set(INKSCAPE_MIMETYPE "image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd;") +configure_file(${INKSCAPE_BINARY_DIR}/inkscape.desktop.template.in ${INKSCAPE_BINARY_DIR}/inkscape.desktop) diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index cf6cadbc4..adfb3ddd8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -15,20 +15,6 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) endif() +message("revision is " ${INKSCAPE_REVISION}) -file(WRITE - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.txt - # unlike autoconf, include config.h - "#ifdef HAVE_CONFIG_H\n" - "# include <config.h>\n" - "#endif\n" - "\n" - "namespace Inkscape {\n" - " char const *version_string = VERSION \" \" \"${INKSCAPE_REVISION}\";\n" - "}\n") - -# Copy the file to the final header only if the version changes -# and avoid needless rebuilds -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.txt - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) +configure_file(${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.in ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) |