[mapguide-commits] r9587 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-07-30 05:36:22 -0700 (Tue, 30 Jul 2019)
New Revision: 9587

Modified:
   trunk/MgDev/CMakeLists.txt
   trunk/MgDev/cmake_build.sh
Log:
Enable version number parameterization in cmake_build.sh

Fixes #2803

Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt	2019-07-26 15:45:16 UTC (rev 9586)
+++ trunk/MgDev/CMakeLists.txt	2019-07-30 12:36:22 UTC (rev 9587)
@@ -60,9 +60,15 @@
 include(CheckSymbolExists)
 include(ExternalProject)
 
-set(MG_VERSION_MAJOR 4)
-set(MG_VERSION_MINOR 0)
-set(MG_VERSION_RELEASE 0)
+if (NOT MG_VERSION_MAJOR)
+    set(MG_VERSION_MAJOR 4)
+endif (MG_VERSION_MAJOR)
+if (NOT MG_VERSION_MINOR)
+    set(MG_VERSION_MINOR 0)
+endif (MG_VERSION_MINOR)
+if (NOT MG_VERSION_RELEASE)
+    set(MG_VERSION_RELEASE 0)
+endif (MG_VERSION_RELEASE)
 if (NOT MG_VERSION_REV)
     set(MG_VERSION_REV 0)
 endif (NOT MG_VERSION_REV)

Modified: trunk/MgDev/cmake_build.sh
===================================================================
--- trunk/MgDev/cmake_build.sh	2019-07-26 15:45:16 UTC (rev 9586)
+++ trunk/MgDev/cmake_build.sh	2019-07-30 12:36:22 UTC (rev 9587)
@@ -5,6 +5,11 @@
 USE_NINJA=0
 USE_ASAN=OFF
 USE_LD_GOLD=OFF
+MG_VERSION_MAJOR=4
+MG_VERSION_MINOR=0
+MG_VERSION_RELEASE=0
+MG_REV=0
+
 while [ $# -gt 0 ]; do    # Until you run out of parameters...
     case "$1" in
         --cmake-build-dir)
@@ -15,6 +20,22 @@
             OEM_WORK_DIR="$2"
             shift
             ;;
+        --mg-ver-major)
+            MG_VERSION_MAJOR=$2
+            shift
+            ;;
+        --mg-ver-minor)
+            MG_VERSION_MINOR=$2
+            shift
+            ;;
+        --mg-ver-rel)
+            MG_VERSION_RELEASE=$2
+            shift
+            ;;
+        --mg-ver-rev)
+            MG_REV=$2
+            shift
+            ;;
         --ninja)
             USE_NINJA=1
             ;;