[Cmake-commits] [cmake-commits] alex committed cmExtraCodeBlocksGenerator.cxx 1.31 1.32
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Oct 12 13:44:44 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4154/Source
Modified Files:
cmExtraCodeBlocksGenerator.cxx
Log Message:
fix indentation
Alex
Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** cmExtraCodeBlocksGenerator.cxx 12 Oct 2009 17:37:09 -0000 1.31
--- cmExtraCodeBlocksGenerator.cxx 12 Oct 2009 17:44:42 -0000 1.32
***************
*** 195,199 ****
virtualFolders += "CMake Files\\" + prefix + path + "\\;";
for (std::vector<Tree>::const_iterator it = folders.begin();
! it != folders.end();
++it)
{
--- 195,199 ----
virtualFolders += "CMake Files\\" + prefix + path + "\\;";
for (std::vector<Tree>::const_iterator it = folders.begin();
! it != folders.end();
++it)
{
***************
*** 277,306 ****
// Convert
for (std::vector<std::string>::const_iterator jt = listFiles.begin();
! jt != listFiles.end();
! ++jt)
! {
! const std::string &relative =
! cmSystemTools::RelativePath(
it->second[0]->GetMakefile()->GetHomeDirectory(),
jt->c_str());
! std::vector<std::string> splitted;
! cmSystemTools::SplitPath(relative.c_str(), splitted, false);
! // Split filename from path
! std::string fileName = *(splitted.end()-1);
! splitted.erase(splitted.end() - 1, splitted.end());
! // We don't want paths with ".." in them
! // reasons are that we don't want files outside the project
! // TODO: the path should be normalized first though
! // We don't want paths with CMakeFiles in them
! // or do we?
! // In speedcrunch those where purely internal
! if (splitted.size() >= 1
! && relative.find("..") == std::string::npos
! && relative.find("CMakeFiles") == std::string::npos)
! {
! tree.InsertPath(splitted, 1, fileName);
! }
! }
}
--- 277,305 ----
// Convert
for (std::vector<std::string>::const_iterator jt = listFiles.begin();
! jt != listFiles.end();
! ++jt)
! {
! const std::string &relative = cmSystemTools::RelativePath(
it->second[0]->GetMakefile()->GetHomeDirectory(),
jt->c_str());
! std::vector<std::string> splitted;
! cmSystemTools::SplitPath(relative.c_str(), splitted, false);
! // Split filename from path
! std::string fileName = *(splitted.end()-1);
! splitted.erase(splitted.end() - 1, splitted.end());
! // We don't want paths with ".." in them
! // reasons are that we don't want files outside the project
! // TODO: the path should be normalized first though
! // We don't want paths with CMakeFiles in them
! // or do we?
! // In speedcrunch those where purely internal
! if (splitted.size() >= 1
! && relative.find("..") == std::string::npos
! && relative.find("CMakeFiles") == std::string::npos)
! {
! tree.InsertPath(splitted, 1, fileName);
! }
! }
}
***************
*** 338,403 ****
ti != targets.end(); ti++)
{
! switch(ti->second.GetType())
{
! case cmTarget::GLOBAL_TARGET:
{
! bool insertTarget = false;
! // Only add the global targets from CMAKE_BINARY_DIR,
! // not from the subdirs
! if (strcmp(makefile->GetStartOutputDirectory(),
! makefile->GetHomeOutputDirectory())==0)
{
! insertTarget = true;
! // only add the "edit_cache" target if it's not ccmake, because
! // this will not work within the IDE
! if (ti->first == "edit_cache")
! {
! if (strstr(makefile->GetRequiredDefinition
("CMAKE_EDIT_COMMAND"), "ccmake")!=NULL)
! {
! insertTarget = false;
! }
}
}
! if (insertTarget)
! {
! this->AppendTarget(fout, ti->first.c_str(), 0,
make.c_str(), makefile, compiler.c_str());
- }
}
! break;
! case cmTarget::UTILITY:
! // Add all utility targets, except the Nightly/Continuous/
! // Experimental-"sub"targets as e.g. NightlyStart
! if (((ti->first.find("Nightly")==0) &&(ti->first!="Nightly"))
|| ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
|| ((ti->first.find("Experimental")==0)
&& (ti->first!="Experimental")))
- {
- break;
- }
-
- this->AppendTarget(fout, ti->first.c_str(), 0,
- make.c_str(), makefile, compiler.c_str());
- break;
- case cmTarget::EXECUTABLE:
- case cmTarget::STATIC_LIBRARY:
- case cmTarget::SHARED_LIBRARY:
- case cmTarget::MODULE_LIBRARY:
{
- this->AppendTarget(fout, ti->first.c_str(), &ti->second,
- make.c_str(), makefile, compiler.c_str());
- std::string fastTarget = ti->first;
- fastTarget += "/fast";
- this->AppendTarget(fout, fastTarget.c_str(), &ti->second,
- make.c_str(), makefile, compiler.c_str());
- }
- break;
- // ignore these:
- case cmTarget::INSTALL_FILES:
- case cmTarget::INSTALL_PROGRAMS:
- case cmTarget::INSTALL_DIRECTORY:
- default:
break;
}
}
--- 337,402 ----
ti != targets.end(); ti++)
{
! switch(ti->second.GetType())
{
! case cmTarget::GLOBAL_TARGET:
! {
! bool insertTarget = false;
! // Only add the global targets from CMAKE_BINARY_DIR,
! // not from the subdirs
! if (strcmp(makefile->GetStartOutputDirectory(),
! makefile->GetHomeOutputDirectory())==0)
{
! insertTarget = true;
! // only add the "edit_cache" target if it's not ccmake, because
! // this will not work within the IDE
! if (ti->first == "edit_cache")
{
! if (strstr(makefile->GetRequiredDefinition
("CMAKE_EDIT_COMMAND"), "ccmake")!=NULL)
! {
! insertTarget = false;
}
}
! }
! if (insertTarget)
! {
! this->AppendTarget(fout, ti->first.c_str(), 0,
make.c_str(), makefile, compiler.c_str());
}
! }
! break;
! case cmTarget::UTILITY:
! // Add all utility targets, except the Nightly/Continuous/
! // Experimental-"sub"targets as e.g. NightlyStart
! if (((ti->first.find("Nightly")==0) &&(ti->first!="Nightly"))
|| ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
|| ((ti->first.find("Experimental")==0)
&& (ti->first!="Experimental")))
{
break;
+ }
+
+ this->AppendTarget(fout, ti->first.c_str(), 0,
+ make.c_str(), makefile, compiler.c_str());
+ break;
+ case cmTarget::EXECUTABLE:
+ case cmTarget::STATIC_LIBRARY:
+ case cmTarget::SHARED_LIBRARY:
+ case cmTarget::MODULE_LIBRARY:
+ {
+ this->AppendTarget(fout, ti->first.c_str(), &ti->second,
+ make.c_str(), makefile, compiler.c_str());
+ std::string fastTarget = ti->first;
+ fastTarget += "/fast";
+ this->AppendTarget(fout, fastTarget.c_str(), &ti->second,
+ make.c_str(), makefile, compiler.c_str());
+ }
+ break;
+ // ignore these:
+ case cmTarget::INSTALL_FILES:
+ case cmTarget::INSTALL_PROGRAMS:
+ case cmTarget::INSTALL_DIRECTORY:
+ default:
+ break;
}
}
***************
*** 677,681 ****
}
else if ((target->GetType()==cmTarget::SHARED_LIBRARY)
! || (target->GetType()==cmTarget::MODULE_LIBRARY))
{
return 3;
--- 676,680 ----
}
else if ((target->GetType()==cmTarget::SHARED_LIBRARY)
! || (target->GetType()==cmTarget::MODULE_LIBRARY))
{
return 3;
More information about the Cmake-commits
mailing list