Merge pull request #641 from stephengtuggy/include-alpha-beta-etc-in-…

…pkg-version_0.8.x Include alpha, beta, etc. in package version - 0.8.x
vegastrike · Jan 14, 2022 · 543b3fb · 543b3fb
2 parents 72ec848 + fb92f20
commit 543b3fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -65,7 +65,10 @@ IF (DEFINED ENV{TAG_NAME} AND NOT "$ENV{TAG_NAME}" STREQUAL "")
 
     IF (NOT "${VEGASTRIKE_VERSION_SHORT_STR}" VERSION_EQUAL "${TAG_VERSION_SHORT_STR}")
         MESSAGE(FATAL_ERROR "!! Project version spelled out in CMake file does not match project version from TAG_NAME environment variable")
-    ENDIF()
+    ENDIF ()
+    IF (NOT "${TAG_VERSION_TWEAK}" STREQUAL "")
+        SET(VEGASTRIKE_VERSION_LONG_STR "${VEGASTRIKE_VERSION_MAJOR}.${VEGASTRIKE_VERSION_MINOR}.${VEGASTRIKE_VERSION_PATCH}${TAG_VERSION_TWEAK}-${VEGASTRIKE_VERSION_TWEAK}")
+    ENDIF ()
 ENDIF ()
 
 # API Version for Game Assets
@@ -119,7 +122,7 @@ PROJECT(Vega_Strike
 CONFIGURE_FILE(src/version.h.in ${CMAKE_SOURCE_DIR}/src/version.h)
 CONFIGURE_FILE(src/version.h.in ${CMAKE_SOURCE_DIR}/setup/src/include/version.h)
 
-MESSAGE("== Vega Strike Version: ${VEGASTRIKE_VERSION_MAJOR}.${VEGASTRIKE_VERSION_MINOR}.${VEGASTRIKE_VERSION_PATCH}-${VEGASTRIKE_VERSION_TWEAK}")
+MESSAGE("== Vega Strike Version: ${VEGASTRIKE_VERSION_LONG_STR}")
 
 SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)

diff --git a/engine/src/version.h.in b/engine/src/version.h.in
@@ -1,8 +1,9 @@
 /*
  * Vega Strike
  * Copyright (C) 2021 Benjamen R. Meyer
+ * Copyright (C) 2022 Stephen G. Tuggy
  *
- * http://vegastrike.sourceforge.net/
+ * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+
+
 #ifndef VEGASTRIKE_VERSION_H__
 #define VEGASTRIKE_VERSION_H__
 
@@ -33,9 +36,11 @@
 #define VEGASTRIKE_VERSION_PATCH "@VEGASTRIKE_VERSION_PATCH@"
 #define VEGASTRIKE_VERSION_TWEAK "@VEGASTRIKE_VERSION_TWEAK@"
 
+#define VEGASTRIKE_VERSION_LONG_STR "@VEGASTRIKE_VERSION_LONG_STR@"
+
 #define VEGASTRIKE_ASSETS_API_VERSION "@VEGASTRIKE_ASSETS_API_VERSION@"
 
-#define VEGASTRIKE_VERSION_STR VEGASTRIKE_VERSION_MAJOR "." VEGASTRIKE_VERSION_MINOR "." VEGASTRIKE_VERSION_PATCH "." VEGASTRIKE_VERSION_TWEAK " ( Assets API Version: " VEGASTRIKE_ASSETS_API_VERSION ")"
+#define VEGASTRIKE_VERSION_STR VEGASTRIKE_VERSION_LONG_STR " (Assets API Version: " VEGASTRIKE_ASSETS_API_VERSION ")"
 //#pragma message "Vega Strike Version " VEGASTRIKE_VERSION_STR
 
 #endif //VEGASTRIKE_VERSION_H__