diff options
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 23 | ||||
| -rw-r--r-- | Source/cmExtraCodeBlocksGenerator.h | 7 | ||||
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 20 |
3 files changed, 24 insertions, 26 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 4a2850d..ddfd32e 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -89,8 +89,7 @@ void cmExtraCodeBlocksGenerator::Generate() " <Workspace title=\""<<workspaceName<<"\">\n"; bool firstProject = true; - // for each sub project in the project create - // a kdevelop project + // for each sub project in the project create a codeblocks project for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator it = this->GlobalGenerator->GetProjectMap().begin(); it!= this->GlobalGenerator->GetProjectMap().end(); @@ -207,21 +206,25 @@ void cmExtraCodeBlocksGenerator case cmTarget::MODULE_LIBRARY: // case cmTarget::UTILITY: fout<<" <Target title=\""<<ti->first<<"\">\n" - " <Option output=\""<<ti->second.GetLocation(0)<<"\" prefix_auto=\"0\" extension_auto=\"0\" />\n" - " <Option working_dir=\""<<makefile->GetStartOutputDirectory()<<"\" />\n" + " <Option output=\""<<ti->second.GetLocation(0) + <<"\" prefix_auto=\"0\" extension_auto=\"0\" />\n" + " <Option working_dir=\""<<makefile->GetStartOutputDirectory() + <<"\" />\n" " <Option type=\"0\" />\n" " <Option compiler=\"gcc\" />\n" " <MakeCommands>\n"; - fout<<" <Build command=\""<<make<<" -f "<<makefile->GetStartOutputDirectory()<<"/Makefile "<<ti->first<<"\" />\n"; - fout<<" <CompileFile command=\""<<make<<" -f "<<makefile->GetStartOutputDirectory()<<"/Makefile "<<ti->first<<"\" />\n"; - fout<<" <Clean command=\""<<make<<" -f "<<makefile->GetStartOutputDirectory()<<"/Makefile clean\" />\n"; - fout<<" <DistClean command=\""<<make<<" -f "<<makefile->GetStartOutputDirectory()<<"/Makefile clean\" />\n"; + fout<<" <Build command=\""<<make<<" -f " + <<makefile->GetStartOutputDirectory()<<"/Makefile "<<ti->first<<"\" />\n"; + fout<<" <CompileFile command=\""<<make<<" -f " + <<makefile->GetStartOutputDirectory()<<"/Makefile "<<ti->first<<"\" />\n"; + fout<<" <Clean command=\""<<make<<" -f " + <<makefile->GetStartOutputDirectory()<<"/Makefile clean\" />\n"; + fout<<" <DistClean command=\""<<make<<" -f " + <<makefile->GetStartOutputDirectory()<<"/Makefile clean\" />\n"; fout<<" </MakeCommands>\n" " </Target>\n"; -// if (ti->second.GetType()==cmTarget::UTILITY) fout<<"****** UTILITY \n"; -// if (ti->second.GetType()==cmTarget::GLOBAL_TARGET) fout<<"****** GLOBAL_YESTERDAY \n"; break; default: break; diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index b61a9fa..9d59936 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -46,15 +46,8 @@ public: virtual void Generate(); private: - /** Create the foo.kdevelop file. This one calls MergeProjectFiles() - if it already exists, otherwise createNewProjectFile() The project - files will be created in \a outputDir (in the build tree), the - kdevelop project dir will be set to \a projectDir (in the source - tree). \a cmakeFilePattern consists of a lists of all cmake - listfiles used by this CMakeLists.txt */ void CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs); - ///! Creates a new foo.kdevelop and a new foo.kdevses file void CreateNewProjectFile(const std::vector<cmLocalGenerator*>& lgs, const std::string& filename); diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 4025110..92d3977 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -498,7 +498,8 @@ void cmExtraEclipseCDT4Generator fout << "<storageModule moduleId=\"scannerConfiguration\">\n" "<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\"" - " selectedProfileId=\"org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile\"/>\n" + " selectedProfileId=\"" + "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile\"/>\n" ; this->AppendScannerProfile(fout, "org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile", @@ -531,8 +532,8 @@ void cmExtraEclipseCDT4Generator "-E -P -v -dD ${plugin_state_location}/${specs_file}", "gcc", true, true); this->AppendScannerProfile(fout, - "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP", - false, "", false, "specsFile", + "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP" + , false, "", false, "specsFile", "-E -P -v -dD ${plugin_state_location}/specs.cpp", "g++", true, true); this->AppendScannerProfile(fout, @@ -550,7 +551,8 @@ void cmExtraEclipseCDT4Generator "cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1\">\n" "<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\"" " selectedProfileId=\"" - "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP\"/>\n" + "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP\"" + "/>\n" ; AppendScannerProfile(fout, @@ -584,8 +586,8 @@ void cmExtraEclipseCDT4Generator "-E -P -v -dD ${plugin_state_location}/${specs_file}", "gcc", true, true); AppendScannerProfile(fout, - "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP", - true, "", false, "specsFile", + "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP" + , true, "", false, "specsFile", "-E -P -v -dD ${plugin_state_location}/specs.cpp", "g++", true, true); AppendScannerProfile(fout, @@ -603,7 +605,7 @@ void cmExtraEclipseCDT4Generator "cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.1\">\n" "<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\"" " selectedProfileId=\"" - "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC\"/>\n" +"org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC\"/>\n" ; AppendScannerProfile(fout, @@ -637,8 +639,8 @@ void cmExtraEclipseCDT4Generator "-E -P -v -dD ${plugin_state_location}/${specs_file}", "gcc", true, true); AppendScannerProfile(fout, - "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP", - false, "", false, "specsFile", + "org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP" + , false, "", false, "specsFile", "-E -P -v -dD ${plugin_state_location}/specs.cpp", "g++", true, true); AppendScannerProfile(fout, |