summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2016-04-12 09:10:40 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2016-04-12 09:10:40 +0000
commit5d542ba036017af885913a6dd1f35b91daba047f (patch)
treee78d874a6873ed1c42988cdbf147f12f1ef43509 /src
parentfix undo clip rendering bug (diff)
downloadinkscape-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 'src')
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/inkscape-version.cpp.in7
2 files changed, 7 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30af55925..5c436cefb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -443,11 +443,6 @@ endif()
# a custom target that is always built
add_custom_target(
inkscape_version ALL
- DEPENDS ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp)
-
-# creates inkscape-version.cpp using cmake script
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp
COMMAND ${CMAKE_COMMAND}
-DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
-DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR}
diff --git a/src/inkscape-version.cpp.in b/src/inkscape-version.cpp.in
new file mode 100644
index 000000000..b4ea5028d
--- /dev/null
+++ b/src/inkscape-version.cpp.in
@@ -0,0 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+namespace Inkscape {
+ char const *version_string = VERSION " " "${INKSCAPE_REVISION}";
+}