Version info

CMakeLists.txt

@@ -9,6 +9,8 @@ include(cmake/common_defines.cmake)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/${TARGET_ARCH}/${CMAKE_BUILD_TYPE})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
+include(cmake/project_options.cmake)
+
 include(cmake/project_files.cmake)
 include(cmake/project_targets.cmake)
 include(cmake/project_properties.cmake)

cmake/project_options.cmake

@@ -0,0 +1 @@
+option(LIBCGSS_LIBRARY_VERSION "Library version. Leave it empty or provide a four-part version string (major.minor.patch.tweak)." "")

cmake/project_properties.cmake

@@ -1,23 +1,22 @@
 if ($ENV{CI})
-    if (DEFINED ENV{LIBCGSS_VERSION_MAJOR)
-        string(LENGTH $ENV{LIBCGSS_VERSION_MAJOR} VERSION_INFO_LENGTH)
+    string(LENGTH LIBCGSS_LIBRARY_VERSION VERSION_INFO_LENGTH)
 
-        if (VERSION_INFO_LENGTH GREATER 0)
-            # If we are in a CI environment, load version info from environment variables (see configure-cmake.ps1)
-            set(PROJECT_VERSION_MAJOR $ENV{LIBCGSS_VERSION_MAJOR})
-            set(PROJECT_VERSION_MINOR $ENV{LIBCGSS_VERSION_MINOR})
-            set(PROJECT_VERSION_PATCH $ENV{LIBCGSS_VERSION_PATCH})
-            set(PROJECT_VERSION_TWEAK $ENV{LIBCGSS_VERSION_TWEAK})
+    if (VERSION_INFO_LENGTH GREATER 0)
+        string(REPLACE "." ";" VERSION_COMPONENTS ${LIBCGSS_LIBRARY_VERSION})
 
-            set_target_properties(cgss
-                    PROPERTIES
-                    VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}"
-                    SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
-                    )
-        else ()
-            message(WARNING "Warning: CI environment detected but libcgss version is empty.")
-        endif ()
+        # If we are in a CI environment, load version info from environment variables (see configure-cmake.ps1)
+        list(GET VERSION_COMPONENTS 0 PROJECT_VERSION_MAJOR)
+        list(GET VERSION_COMPONENTS 1 PROJECT_VERSION_MINOR)
+        list(GET VERSION_COMPONENTS 2 PROJECT_VERSION_PATCH)
+        # Always 0
+        set(PROJECT_VERSION_TWEAK 0)
+
+        set_target_properties(cgss
+                PROPERTIES
+                VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}"
+                SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+                )
     else ()
-        message(WARNING "Warning: CI environment detected but libcgss version is not defined.")
+        message(WARNING "Warning: CI environment detected but libcgss version is empty.")
     endif ()
 endif ()

scripts/configure-cmake-ubuntu.ps1

@@ -82,6 +82,18 @@ $cmakeParams.AddRange([System.Linq.Enumerable]::Select(
         })
 )
 
+if ($env:CI)
+{
+    if (-not [String]::IsNullOrWhiteSpace($env:LIBCGSS_LIBRARY_VERSION))
+    {
+        $cmakeParams.Add("-DLIBCGSS_LIBRARY_VERSION=`"$env:LIBCGSS_LIBRARY_VERSION`"")
+    }
+    else
+    {
+        Write-Error "Should not happen."
+    }
+}
+
 $cmakeParams.AddRange([String[]]@("-DCMAKE_BUILD_TYPE=MinSizeRel", "../.."))
 
 $cmakeParamsLit = [String]::Join(' ', $cmakeParams)

scripts/configure-cmake-win.ps1

@@ -69,6 +69,18 @@ $cmakeParams.AddRange([System.Linq.Enumerable]::Select(
         })
 )
 
+if ($env:CI)
+{
+    if (-not [String]::IsNullOrWhiteSpace($env:LIBCGSS_LIBRARY_VERSION))
+    {
+        $cmakeParams.Add("-DLIBCGSS_LIBRARY_VERSION=`"$env:LIBCGSS_LIBRARY_VERSION`"")
+    }
+    else
+    {
+        Write-Error "Should not happen."
+    }
+}
+
 if ($multiPlatform)
 {
     [String]$cmakeGenArch = 'Win32';

scripts/configure-cmake.ps1

@@ -30,12 +30,8 @@ if ($null -ne $scriptPath)
 
         if (-not([String]::IsNullOrWhiteSpace($buildVersion)))
         {
-            [String[]]$versionParts = $buildVersion.Split('.')
-
-            Set-PersistentEnvironmentVariable("LIBCGSS_VERSION_MAJOR", $versionParts[0])
-            Set-PersistentEnvironmentVariable("LIBCGSS_VERSION_MINOR", $versionParts[1])
-            Set-PersistentEnvironmentVariable("LIBCGSS_VERSION_PATCH", $versionParts[2])
-            Set-PersistentEnvironmentVariable("LIBCGSS_VERSION_TWEAK", "0") # alwasy "0"
+            # OK I give up.
+            $env:LIBCGSS_LIBRARY_VERSION = $buildVersion
         }
     }