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

Add GENERATED to cmSourceFilesRemoveCommand

This commit is contained in:
Andy Cedilnik 2002-01-18 15:39:24 -05:00
parent 21c01f609d
commit 21224d0bf1
4 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmSourceFilesRemoveCommand.cxx
View File

@ -48,13 +48,46 @@ bool cmSourceFilesRemoveCommand::InitialPass(std::vector<std::string> const& arg
this->SetError("called with incorrect number of arguments"); this->SetError("called with incorrect number of arguments");
return false; return false;
} }
int generated = 0;
for(std::vector<std::string>::const_iterator i = (args.begin() + 1); for(std::vector<std::string>::const_iterator i = (args.begin() + 1);
i != args.end(); ++i) i != args.end(); ++i)
{ {
std::string copy = *i;
if ( copy == "GENERATED" )
{
generated = 1;
continue;
}
cmSourceFile file; cmSourceFile file;
if ( generated )
{
// This file will be generated, so we should not check
// if it exist.
std::string ext = cmSystemTools::GetFilenameExtension(copy);
std::string path = cmSystemTools::GetFilenamePath(copy);
std::string name_no_ext = cmSystemTools::GetFilenameName(copy.c_str());
name_no_ext = name_no_ext.substr(0, name_no_ext.length()-ext.length());
if ( ext[0] == '.' )
{
ext = ext.substr(1);
}
if((path.size() && path[0] == '/') ||
(path.size() > 1 && path[1] == ':'))
{
file.SetName(name_no_ext.c_str(), path.c_str(), ext.c_str(), false);
}
else
{
file.SetName(name_no_ext.c_str(), m_Makefile->GetCurrentOutputDirectory(),
ext.c_str(), false);
}
}
else
{
file.SetName((*i).c_str(), m_Makefile->GetCurrentDirectory(), file.SetName((*i).c_str(), m_Makefile->GetCurrentDirectory(),
m_Makefile->GetSourceExtensions(), m_Makefile->GetSourceExtensions(),
m_Makefile->GetHeaderExtensions()); m_Makefile->GetHeaderExtensions());
}
m_Makefile->RemoveSource(file, args[0].c_str()); m_Makefile->RemoveSource(file, args[0].c_str());
} }
return true; return true;

4
Tests/Complex/Library/CMakeLists.txt
View File

@ -1,8 +1,8 @@
AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources) AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources)
# SOURCE_FILES_REMOVE is used for Coverage # SOURCE_FILES_REMOVE is used for Coverage
SOURCE_FILES(LibrarySources file2 create_file.cxx) SOURCE_FILES(LibrarySources file2 GENERATED nonexisting_file)
SOURCE_FILES_REMOVE(LibrarySources create_file.cxx) SOURCE_FILES_REMOVE(LibrarySources GENERATED nonexisting_file)
ADD_LIBRARY(CMakeTestLibrary LibrarySources) ADD_LIBRARY(CMakeTestLibrary LibrarySources)
SOURCE_FILES(SharedLibrarySources sharedFile) SOURCE_FILES(SharedLibrarySources sharedFile)

4
Tests/ComplexOneConfig/Library/CMakeLists.txt
View File

@ -1,8 +1,8 @@
AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources) AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources)
# SOURCE_FILES_REMOVE is used for Coverage # SOURCE_FILES_REMOVE is used for Coverage
SOURCE_FILES(LibrarySources file2 create_file.cxx) SOURCE_FILES(LibrarySources file2 GENERATED nonexisting_file)
SOURCE_FILES_REMOVE(LibrarySources create_file.cxx) SOURCE_FILES_REMOVE(LibrarySources GENERATED nonexisting_file)
ADD_LIBRARY(CMakeTestLibrary LibrarySources) ADD_LIBRARY(CMakeTestLibrary LibrarySources)
SOURCE_FILES(SharedLibrarySources sharedFile) SOURCE_FILES(SharedLibrarySources sharedFile)

4
Tests/ComplexRelativePaths/Library/CMakeLists.txt
View File

@ -1,8 +1,8 @@
AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources) AUX_SOURCE_DIRECTORY(ExtraSources LibrarySources)
# SOURCE_FILES_REMOVE is used for Coverage # SOURCE_FILES_REMOVE is used for Coverage
SOURCE_FILES(LibrarySources file2 create_file.cxx) SOURCE_FILES(LibrarySources file2 GENERATED nonexisting_file)
SOURCE_FILES_REMOVE(LibrarySources create_file.cxx) SOURCE_FILES_REMOVE(LibrarySources GENERATED nonexisting_file)
ADD_LIBRARY(CMakeTestLibrary LibrarySources) ADD_LIBRARY(CMakeTestLibrary LibrarySources)
SOURCE_FILES(SharedLibrarySources sharedFile) SOURCE_FILES(SharedLibrarySources sharedFile)