kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: set CMAKE_SYSTEM_VERSION for windows

This commit is contained in:
Bill Hoffman 2003-07-16 15:38:31 -04:00
parent 8ca5266645
commit 79c298e12c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/CMakeDetermineSystem.cmake
View File

@ -36,7 +36,6 @@ IF(UNIX)
ELSE(UNIX)
IF(WIN32)
SET (CMAKE_SYSTEM_NAME "Windows")
SET (CMAKE_SYSTEM_VERSION "")
SET (CMAKE_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
ENDIF(WIN32)
ENDIF(UNIX)

17
Source/cmGlobalGenerator.cxx
View File

@ -20,6 +20,10 @@
#include "cmMakefile.h"
#include <stdlib.h> // required for atof
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#endif
cmGlobalGenerator::cmGlobalGenerator()
{
// do nothing duh
@ -38,7 +42,7 @@ cmGlobalGenerator::~cmGlobalGenerator()
void cmGlobalGenerator::EnableLanguage(const char* lang,
cmMakefile *mf)
cmMakefile *mf)
{
if(m_FindMakeProgramFile.size() == 0)
{
@ -93,6 +97,17 @@ void cmGlobalGenerator::EnableLanguage(const char* lang,
!this->GetLanguageEnabled("C") && !this->GetLanguageEnabled("CXX") &&
!this->GetLanguageEnabled("JAVA"))
{
#if defined(_WIN32) && !defined(__CYGWIN__)
/* Windows version number data. */
OSVERSIONINFO osvi;
ZeroMemory(&osvi, sizeof(osvi));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx (&osvi);
cmOStringStream windowsVersionString;
windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
windowsVersionString.str();
mf->AddDefinition("CMAKE_SYSTEM_VERSION", windowsVersionString.str().c_str());
#endif
// Read the DetermineSystem file
std::string systemFile = root;
systemFile += "/Modules/CMakeDetermineSystem.cmake";