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

cmMakefile: Set default internal definitions directly. 

The usage tracking of cmMakefile::AddDefinition is not needed.
This commit is contained in:
Stephen Kelly 2015-10-13 21:45:02 +02:00
parent 871ab98dad
commit 84e0776e77
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/cmMakefile.cxx
View File

@ -50,7 +50,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
{ {
this->IsSourceFileTryCompile = false; this->IsSourceFileTryCompile = false;
// Initialize these first since AddDefaultDefinitions calls AddDefinition
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
@ -3171,36 +3170,37 @@ void cmMakefile::AddDefaultDefinitions()
will be reset in CMakeSystemSpecificInformation.cmake before the platform will be reset in CMakeSystemSpecificInformation.cmake before the platform
files are executed. */ files are executed. */
#if defined(_WIN32) #if defined(_WIN32)
this->AddDefinition("WIN32", "1"); this->StateSnapshot.SetDefinition("WIN32", "1");
this->AddDefinition("CMAKE_HOST_WIN32", "1"); this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
#else #else
this->AddDefinition("UNIX", "1"); this->StateSnapshot.SetDefinition("UNIX", "1");
this->AddDefinition("CMAKE_HOST_UNIX", "1"); this->StateSnapshot.SetDefinition("CMAKE_HOST_UNIX", "1");
#endif #endif
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32"))) if(cmSystemTools::IsOn(cmSystemTools::GetEnv("CMAKE_LEGACY_CYGWIN_WIN32")))
{ {
this->AddDefinition("WIN32", "1"); this->StateSnapshot.SetDefinition("WIN32", "1");
this->AddDefinition("CMAKE_HOST_WIN32", "1"); this->StateSnapshot.SetDefinition("CMAKE_HOST_WIN32", "1");
} }
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
this->AddDefinition("APPLE", "1"); this->StateSnapshot.SetDefinition("APPLE", "1");
this->AddDefinition("CMAKE_HOST_APPLE", "1"); this->StateSnapshot.SetDefinition("CMAKE_HOST_APPLE", "1");
#endif #endif
char temp[1024]; char temp[1024];
sprintf(temp, "%d", cmVersion::GetMinorVersion()); sprintf(temp, "%d", cmVersion::GetMinorVersion());
this->AddDefinition("CMAKE_MINOR_VERSION", temp); this->StateSnapshot.SetDefinition("CMAKE_MINOR_VERSION", temp);
sprintf(temp, "%d", cmVersion::GetMajorVersion()); sprintf(temp, "%d", cmVersion::GetMajorVersion());
this->AddDefinition("CMAKE_MAJOR_VERSION", temp); this->StateSnapshot.SetDefinition("CMAKE_MAJOR_VERSION", temp);
sprintf(temp, "%d", cmVersion::GetPatchVersion()); sprintf(temp, "%d", cmVersion::GetPatchVersion());
this->AddDefinition("CMAKE_PATCH_VERSION", temp); this->StateSnapshot.SetDefinition("CMAKE_PATCH_VERSION", temp);
sprintf(temp, "%d", cmVersion::GetTweakVersion()); sprintf(temp, "%d", cmVersion::GetTweakVersion());
this->AddDefinition("CMAKE_TWEAK_VERSION", temp); this->StateSnapshot.SetDefinition("CMAKE_TWEAK_VERSION", temp);
this->AddDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion()); this->StateSnapshot.SetDefinition("CMAKE_VERSION",
cmVersion::GetCMakeVersion());
this->AddDefinition("CMAKE_FILES_DIRECTORY", this->StateSnapshot.SetDefinition("CMAKE_FILES_DIRECTORY",
cmake::GetCMakeFilesDirectory()); cmake::GetCMakeFilesDirectory());
} }