cmake: use complete version string in radiant about dialog
authorThomas Debesse <dev@illwieckz.net>
Tue, 4 Jun 2019 23:46:28 +0000 (01:46 +0200)
committerThomas Debesse <dev@illwieckz.net>
Sun, 16 Jun 2019 13:22:23 +0000 (15:22 +0200)
CMakeLists.txt
Makefile
include/version.h
radiant/gtkdlgs.cpp

index f3d8596..6a13aa6 100644 (file)
@@ -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)
index 5867943..f60b0d1 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
index 745b5d3..cb97e38 100644 (file)
@@ -2,3 +2,6 @@
 #ifndef RADIANT_VERSION
 #error no RADIANT_VERSION defined
 #endif
+#ifndef RADIANT_VERSION_STRING
+#error no RADIANT_VERSION_STRING defined
+#endif
index a7e3fbc..6262da5 100644 (file)
@@ -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"