mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Adding .hh file as a C++ header file extension. Remove duplicate code from implementation of unique object name computation for VS generators. This addresses bug#3565.

Browse Source
This commit is contained in:
Brad King
2006-08-01 10:48:40 -04:00
parent c75fb61f3c
commit 8dda3a2f6e
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalVisualStudioGenerator.cxx
+12 -8
View File
@@ -30,6 +30,14 @@ cmLocalVisualStudioGenerator::~cmLocalVisualStudioGenerator()
{
}
//----------------------------------------------------------------------------
bool cmLocalVisualStudioGenerator::SourceFileCompiles(const cmSourceFile* sf)
{
return (!sf->GetCustomCommand() &&
!sf->GetPropertyAsBool("HEADER_FILE_ONLY") &&
!sf->GetPropertyAsBool("EXTERNAL_OBJECT"));
}
//----------------------------------------------------------------------------
void cmLocalVisualStudioGenerator::ComputeObjectNameRequirements
(std::vector<cmSourceGroup> const& sourceGroups)
@@ -46,14 +54,12 @@ void cmLocalVisualStudioGenerator::ComputeObjectNameRequirements
for(std::vector<const cmSourceFile*>::const_iterator s = srcs.begin();
s != srcs.end(); ++s)
{
const cmSourceFile& sf = *(*s);
if(!sf.GetCustomCommand() &&
!sf.GetPropertyAsBool("HEADER_FILE_ONLY") &&
!sf.GetPropertyAsBool("EXTERNAL_OBJECT"))
const cmSourceFile* sf = *s;
if(this->SourceFileCompiles(sf))
{
std::string objectName =
cmSystemTools::GetFilenameWithoutLastExtension(
sf.GetFullPath().c_str());
sf->GetFullPath().c_str());
objectName += ".obj";
objectNameCounts[objectName] += 1;
}
@@ -70,9 +76,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectNameRequirements
s != srcs.end(); ++s)
{
const cmSourceFile* sf = *s;
if(!sf->GetCustomCommand() &&
!sf->GetPropertyAsBool("HEADER_FILE_ONLY") &&
!sf->GetPropertyAsBool("EXTERNAL_OBJECT"))
if(this->SourceFileCompiles(sf))
{
std::string objectName =
cmSystemTools::GetFilenameWithoutLastExtension(