From 5d542ba036017af885913a6dd1f35b91daba047f Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 12 Apr 2016 11:10:40 +0200
Subject: 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)
---
 src/CMakeLists.txt          | 5 -----
 src/inkscape-version.cpp.in | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 src/inkscape-version.cpp.in

(limited to 'src')

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}";
+}
-- 
cgit v1.2.3