[ros-diffs] [reactos] 01/01: [CMAKE] Add architecture to our build string

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=743c378ed12136f003e4d0e2b3d8874b565b8327

commit 743c378ed12136f003e4d0e2b3d8874b565b8327
Author:     Timo Kreuzer <timo.kreu...@reactos.org>
AuthorDate: Fri Mar 9 21:31:15 2018 +0100
Commit:     Timo Kreuzer <timo.kreu...@reactos.org>
CommitDate: Sat Nov 7 18:40:45 2020 +0100

    [CMAKE] Add architecture to our build string
    
    This introduces a new CMake variable WINARCH, which what Windows usually 
uses ("x86" instead of "i386") e.g. in sxs names.
---
 CMakeLists.txt                    | 13 ++++++++++---
 sdk/include/reactos/version.cmake |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8cced5d1fe..f81d9274381 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,6 @@ include(CMakeDependentOption)
 
 project(REACTOS)
 
-# Versioning
-include(sdk/include/reactos/version.cmake)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
@@ -32,6 +29,16 @@ endif()
 # for more information.
 string(TOLOWER ${ARCH} ARCH)
 
+# Alternative WinNT-compatible architecture string
+if(ARCH STREQUAL "i386")
+    set(WINARCH "x86")
+else()
+    set(WINARCH ${ARCH})
+endif()
+
+# Versioning
+include(sdk/include/reactos/version.cmake)
+
 # Compile options
 if(ARCH STREQUAL "i386")
     include(sdk/cmake/config.cmake)
diff --git a/sdk/include/reactos/version.cmake 
b/sdk/include/reactos/version.cmake
index 95cde4307a2..0ca632f2b7c 100644
--- a/sdk/include/reactos/version.cmake
+++ b/sdk/include/reactos/version.cmake
@@ -9,7 +9,7 @@ set(COPYRIGHT_YEAR "2020")
 # or "RC1", "RC2", "" for releases.
 set(KERNEL_VERSION_BUILD_TYPE "dev")
 
-set(KERNEL_VERSION 
"${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}")
+set(KERNEL_VERSION 
"${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_VERSION_PATCH_LEVEL}-${WINARCH}")
 if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "")
     set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
 endif()