cmake: use complete version string in radiant about dialog

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3d85967dfc233974e81e782d92f15f5b70ee3a8..6a13aa647a1c543e85f34e5fcc351f7931905059 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ endif ()
 
 if (BUILD_BINARIES)
     add_definitions(-DRADIANT_VERSION="${RADIANT_VERSION}")
+    add_definitions(-DRADIANT_VERSION_STRING="${RADIANT_VERSION_STRING}")
 
     if (NOT CMAKE_BUILD_TYPE MATCHES Release)
         add_definitions(-D_DEBUG=1)

diff --git a/Makefile b/Makefile
index 58679435835de423adb9aa3bcf2cc3e122754660..f60b0d18d669de36aef680e03841ce966f158483 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -263,7 +263,7 @@ ifneq ($(GIT_VERSION),)
        Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION)
 endif
 
-CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DRADIANT_NAME="\"${RADIANT_NAME}\"" -DRADIANT_BASENAME="\"${RADIANT_BASENAME}\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
+CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_VERSION_STRING="\"$(RADIANT_VERSION_STRING)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DRADIANT_NAME="\"${RADIANT_NAME}\"" -DRADIANT_BASENAME="\"${RADIANT_BASENAME}\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""
 CPPFLAGS += -DGTK_TARGET=2
 
 .PHONY: all

diff --git a/include/version.h b/include/version.h
index 745b5d394de38c6ebb871bb35e05f29c5bd1c734..cb97e381fb7298dc6393779cfd2725a2f37e2364 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -2,3 +2,6 @@
 #ifndef RADIANT_VERSION
 #error no RADIANT_VERSION defined
 #endif
+#ifndef RADIANT_VERSION_STRING
+#error no RADIANT_VERSION_STRING defined
+#endif

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index a7e3fbce744b6186b970cb5136e720132e191ddd..6262da5906cad566cac3bd4b5f9c5ee496738f7a 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -450,7 +450,7 @@ void DoAbout(){
                        }
 
                        {
-                               char const *label_text = "NetRadiant " RADIANT_VERSION "\n"
+                               char const *label_text = "NetRadiant " RADIANT_VERSION_STRING "\n"
                                                                                __DATE__ "\n\n"
                                         RADIANT_ABOUTMSG "\n\n"
                                                                                "This program is free software\n"