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

Merge topic 'fix-warnings'

Browse Source 
f90acf52 cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
e67e0155 cmMakefile: Avoid name conflict with Solaris global typedef
This commit is contained in:
Brad King 2015-10-01 11:02:34 -04:00 committed by CMake Topic Stage
commit 5303c187b1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -3218,7 +3218,7 @@ void cmMakefile::AddDefaultDefinitions()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmMakefile::GetConfigurations(std::vector<std::string>& configs, cmMakefile::GetConfigurations(std::vector<std::string>& configs,
bool single) const bool singleConfig) const
{ {
if(this->GetGlobalGenerator()->IsMultiConfig()) if(this->GetGlobalGenerator()->IsMultiConfig())
{ {
@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector<std::string>& configs,
else else
{ {
const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE"); const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
if(single && !buildType.empty()) if(singleConfig && !buildType.empty())
{ {
configs.push_back(buildType); configs.push_back(buildType);
} }

2
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -3475,7 +3475,7 @@ bool cmVisualStudio10TargetGenerator::ForceOld(const std::string& source) const
return false; return false;
} }
FILETIME const ftime_20010101 = { 3365781504, 29389701 }; FILETIME const ftime_20010101 = { 3365781504u, 29389701u };
if (!SetFileTime(h, &ftime_20010101, &ftime_20010101, &ftime_20010101)) if (!SetFileTime(h, &ftime_20010101, &ftime_20010101, &ftime_20010101))
{ {
CloseHandle(h); CloseHandle(h);