Simplified Config.h template

CMakeLists.txt

@@ -5,6 +5,7 @@ project (OpenRaider)
 set (OpenRaider_VERSION_MAJOR 0)
 set (OpenRaider_VERSION_MINOR 1)
 set (OpenRaider_VERSION_MICRO 2)
+set (OpenRaider_VERSION_RELEASE -git)
 
 # Build Host
 set (OpenRaider_BUILD_HOST ${CMAKE_HOST_SYSTEM})

cmake/Config.h.in

@@ -1,13 +1,2 @@
-#define OpenRaider_VERSION_MAJOR @OpenRaider_VERSION_MAJOR@
-#define OpenRaider_VERSION_MINOR @OpenRaider_VERSION_MINOR@
-#define OpenRaider_VERSION_MICRO @OpenRaider_VERSION_MICRO@
-#define OpenRaider_BUILD_HOST @OpenRaider_BUILD_HOST@
-
-// Stringification Helper
-#define _xstringify(s) _stringify(s)
-#define _stringify(s) #s
-
-#define VERSION_NUMBER OpenRaider_VERSION_MAJOR.OpenRaider_VERSION_MINOR.OpenRaider_VERSION_MICRO
-
-#define VERSION _xstringify(OpenRaider-VERSION_NUMBER)
-#define BUILD_HOST _xstringify(OpenRaider_BUILD_HOST)
+#define VERSION "OpenRaider-@OpenRaider_VERSION_MAJOR@.@OpenRaider_VERSION_MINOR@.@OpenRaider_VERSION_MICRO@@OpenRaider_VERSION_RELEASE@"
+#define BUILD_HOST "@OpenRaider_BUILD_HOST@"

src/CMakeLists.txt

@@ -27,10 +27,10 @@ if (APPLE)
     set (MACOSX_BUNDLE_INFO_STRING "OpenSource TombRaider Game Engine")
     set (MACOSX_BUNDLE_ICON_FILE "AppIcon")
     set (MACOSX_BUNDLE_GUI_IDENTIFIER "de.xythobuz.OpenRaider")
-    set (MACOSX_BUNDLE_LONG_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}")
+    set (MACOSX_BUNDLE_LONG_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
     set (MACOSX_BUNDLE_BUNDLE_NAME "OpenRaider")
-    set (MACOSX_BUNDLE_SHORT_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}")
-    set (MACOSX_BUNDLE_BUNDLE_VERSION "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}")
+    set (MACOSX_BUNDLE_SHORT_VERSION_STRING "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
+    set (MACOSX_BUNDLE_BUNDLE_VERSION "${OpenRaider_VERSION_MAJOR}.${OpenRaider_VERSION_MINOR}.${OpenRaider_VERSION_MICRO}-${OpenRaider_VERSION_RELEASE}")
     set (MACOSX_BUNDLE_COPYRIGHT "2001 - 2014")
 
     # Copy Icon