Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE] Add architecture to our build string

Browse source 
This introduces a new CMake variable WINARCH, which what Windows usually uses ("x86" instead of "i386") e.g. in sxs names.
This commit is contained in:
Timo Kreuzer 2018-03-09 21:31:15 +01:00
parent 0b0bb1a93b
commit 743c378ed1
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -9,9 +9,6 @@ include(CMakeDependentOption)
project(REACTOS) project(REACTOS)
# Versioning
include(sdk/include/reactos/version.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
set(CMAKE_SHARED_LIBRARY_PREFIX "") set(CMAKE_SHARED_LIBRARY_PREFIX "")
@ -32,6 +29,16 @@ endif()
# for more information. # for more information.
string(TOLOWER ${ARCH} ARCH) 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 # Compile options
if(ARCH STREQUAL "i386") if(ARCH STREQUAL "i386")
include(sdk/cmake/config.cmake) include(sdk/cmake/config.cmake)

2
sdk/include/reactos/version.cmake
View file

@ -9,7 +9,7 @@ set(COPYRIGHT_YEAR "2020")
# or "RC1", "RC2", "" for releases. # or "RC1", "RC2", "" for releases.
set(KERNEL_VERSION_BUILD_TYPE "dev") 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 "") if(NOT KERNEL_VERSION_BUILD_TYPE STREQUAL "")
set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}") set(KERNEL_VERSION "${KERNEL_VERSION}-${KERNEL_VERSION_BUILD_TYPE}")
endif() endif()