Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 11:18:40 +08:00
Code Issues Projects Releases Wiki Activity

Make CMAKE_HOST_SYSTEM_NAME available in scripting context

Browse Source
This commit is contained in:
Gregor Jasny
2016-12-26 16:08:51 +01:00
parent 96b6afdc42
commit 0bbd993f61
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineSystem.cmake
View File

@@ -35,7 +35,6 @@
if(CMAKE_HOST_UNIX) if(CMAKE_HOST_UNIX)
find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
if(CMAKE_UNAME) if(CMAKE_UNAME)
exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
@@ -67,7 +66,6 @@ if(CMAKE_HOST_UNIX)
endif() endif()
else() else()
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set (CMAKE_HOST_SYSTEM_NAME "Windows")
if (DEFINED ENV{PROCESSOR_ARCHITEW6432}) if (DEFINED ENV{PROCESSOR_ARCHITEW6432})
set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}") set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
else() else()

10
Source/cmStateSnapshot.cxx
View File

@@ -18,6 +18,10 @@
#include "cmVersion.h" #include "cmVersion.h"
#include "cmake.h" #include "cmake.h"
#if !defined(_WIN32)
#include <sys/utsname.h>
#endif
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#include "cmSystemTools.h" #include "cmSystemTools.h"
#endif #endif
@@ -298,9 +302,15 @@ void cmStateSnapshot::SetDefaultDefinitions()
#if defined(_WIN32) #if defined(_WIN32)
this->SetDefinition("WIN32", "1"); this->SetDefinition("WIN32", "1");
this->SetDefinition("CMAKE_HOST_WIN32", "1"); this->SetDefinition("CMAKE_HOST_WIN32", "1");
this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", "Windows");
#else #else
this->SetDefinition("UNIX", "1"); this->SetDefinition("UNIX", "1");
this->SetDefinition("CMAKE_HOST_UNIX", "1"); this->SetDefinition("CMAKE_HOST_UNIX", "1");
struct utsname uts_name;
if (uname(&uts_name) == 0) {
this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", uts_name.sysname);
}
#endif #endif
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
std::string legacy; std::string legacy;

1
Tests/CMakeTests/ToolchainTest.cmake.in
View File

@@ -48,7 +48,6 @@ set(CMAKE_SYSTEM_NAME)
set(CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION)
set(CMAKE_SYSTEM_PROCESSOR) set(CMAKE_SYSTEM_PROCESSOR)
set(CMAKE_HOST_SYSTEM) set(CMAKE_HOST_SYSTEM)
set(CMAKE_HOST_SYSTEM_NAME)
set(CMAKE_HOST_SYSTEM_VERSION) set(CMAKE_HOST_SYSTEM_VERSION)
set(CMAKE_HOST_SYSTEM_PROCESSOR) set(CMAKE_HOST_SYSTEM_PROCESSOR)