diff options
author | Alex Neundorf <neundorf@kde.org> | 2010-11-11 21:02:07 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2010-11-11 21:02:07 (GMT) |
commit | 7b1421b88553f4c1fa685be5bd84a5e950490317 (patch) | |
tree | fd6d5ed938a8217b49faf6f5b45cf5be45873485 /Source/cmExtraEclipseCDT4Generator.cxx | |
parent | 3c245ab2baa159ede1957c3d6ea0d8597f8b67e7 (diff) | |
download | CMake-7b1421b88553f4c1fa685be5bd84a5e950490317.zip CMake-7b1421b88553f4c1fa685be5bd84a5e950490317.tar.gz CMake-7b1421b88553f4c1fa685be5bd84a5e950490317.tar.bz2 |
Remove trailing whitespace
Alex
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.cxx')
-rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 204d5d7..862a9ae 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -73,7 +73,7 @@ void cmExtraEclipseCDT4Generator::Generate() this->IsOutOfSourceBuild = (this->HomeDirectory!=this->HomeOutputDirectory); - this->GenerateSourceProject = (this->IsOutOfSourceBuild && + this->GenerateSourceProject = (this->IsOutOfSourceBuild && mf->IsOn("ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT")); // NOTE: This is not good, since it pollutes the source tree. However, @@ -109,7 +109,7 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile() const return; } - fout << + fout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<projectDescription>\n" "\t<name>" << name << "</name>\n" @@ -129,7 +129,7 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile() const void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout, const char* envVar, cmMakefile* mf) { - // get the variables from the environment and from the cache and then + // get the variables from the environment and from the cache and then // figure out which one to use: const char* envVarValue = getenv(envVar); @@ -148,7 +148,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout, } else if (envVarValue!=0 && cacheValue==0) { - // The variable is in the env, but not in the cache. Use it and put it + // The variable is in the env, but not in the cache. Use it and put it // in the cache valueToUse = envVarValue; mf->AddCacheDefinition(cacheEntryName.c_str(), valueToUse.c_str(), @@ -206,7 +206,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() compilerId = mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"); } - fout << + fout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<projectDescription>\n" "\t<name>" << @@ -225,7 +225,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() ; // use clean target - fout << + fout << "\t\t\t\t<dictionary>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>\n" "\t\t\t\t\t<value>clean</value>\n" @@ -246,7 +246,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() // set the make command std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); - fout << + fout << "\t\t\t\t<dictionary>\n" "\t\t\t\t\t<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>\n" "\t\t\t\t\t<value>true</value>\n" @@ -296,7 +296,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() else if (compilerId == "Intel") { // if the env.var is set, use this one and put it in the cache - // if the env.var is not set, but the value is in the cache, + // if the env.var is not set, but the value is in the cache, // use it from the cache: AddEnvVar(fout, "INTEL_LICENSE_FILE", mf); } @@ -392,9 +392,9 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() { fout << "\t<linkedResources>\n"; // create a linked resource to CMAKE_SOURCE_DIR - // (this is not done anymore for each project because of - // http://public.kitware.com/Bug/view.php?id=9978 and because I found it - // actually quite confusing in bigger projects with many directories and + // (this is not done anymore for each project because of + // http://public.kitware.com/Bug/view.php?id=9978 and because I found it + // actually quite confusing in bigger projects with many directories and // projects, Alex std::string sourceLinkedResourceName = "[Source directory]"; @@ -440,7 +440,7 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories( if(emittedDirs.find(dir) == emittedDirs.end()) { emittedDirs.insert(dir); - fout << "<pathentry include=\"" + fout << "<pathentry include=\"" << cmExtraEclipseCDT4Generator::GetEclipsePath(dir) << "\" kind=\"inc\" path=\"\" system=\"true\"/>\n"; } @@ -452,7 +452,7 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories( void cmExtraEclipseCDT4Generator::CreateCProjectFile() const { std::set<std::string> emmited; - + const cmMakefile* mf = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile(); @@ -465,7 +465,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const } // add header - fout << + fout << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" "<?fileVersion 4.0.0?>\n\n" "<cproject>\n" @@ -475,7 +475,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const fout << "<cconfiguration id=\"org.eclipse.cdt.core.default.config.1\">\n"; // Configuration settings... - fout << + fout << "<storageModule" " buildSystemId=\"org.eclipse.cdt.core.defaultConfigDataProvider\"" " id=\"org.eclipse.cdt.core.default.config.1\"" @@ -536,9 +536,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const fout << "</extensions>\n" "</storageModule>\n" ; - + // ??? - fout << + fout << "<storageModule moduleId=\"org.eclipse.cdt.core.language.mapping\">\n" "<project-mappings/>\n" "</storageModule>\n" @@ -619,13 +619,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const // we have -DFOO def = *di; } - + // insert the definition if not already added. if(emmited.find(def) == emmited.end()) { emmited.insert(def); fout << "<pathentry kind=\"mac\" name=\"" << def - << "\" path=\"\" value=\"" << this->EscapeForXML(val) + << "\" path=\"\" value=\"" << this->EscapeForXML(val) << "\"/>\n"; } } @@ -712,8 +712,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const = (*it)->GetMakefile()->GetIncludeDirectories(); this->AppendIncludeDirectories(fout, includeDirs, emmited); } - // now also the system include directories, in case we found them in - // CMakeSystemSpecificInformation.cmake. This makes Eclipse find the + // now also the system include directories, in case we found them in + // CMakeSystemSpecificInformation.cmake. This makes Eclipse find the // standard headers. mf->GetDefinition("CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS"); std::string compiler = mf->GetSafeDefinition("CMAKE_C_COMPILER"); @@ -738,7 +738,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const fout << "</storageModule>\n"; // add build targets - fout << + fout << "<storageModule moduleId=\"org.eclipse.cdt.make.core.buildtargets\">\n" "<buildTargets>\n" ; @@ -746,7 +746,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); cmGlobalGenerator* generator = const_cast<cmGlobalGenerator*>(this->GlobalGenerator); - + std::string allTarget; std::string cleanTarget; if (generator->GetAllTargetName()) @@ -758,7 +758,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const cleanTarget = generator->GetCleanTargetName(); } - // add all executable and library targets and some of the GLOBAL + // add all executable and library targets and some of the GLOBAL // and UTILITY targets for (std::vector<cmLocalGenerator*>::const_iterator it = this->GlobalGenerator->GetLocalGenerators().begin(); @@ -781,7 +781,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const case cmTarget::GLOBAL_TARGET: { bool insertTarget = false; - // Only add the global targets from CMAKE_BINARY_DIR, + // Only add the global targets from CMAKE_BINARY_DIR, // not from the subdirs if (subdir.empty()) { @@ -813,7 +813,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const // 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.find("Experimental")==0) && (ti->first!="Experimental"))) { break; @@ -842,7 +842,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const break; } } - + // insert the all and clean targets in every subdir if (!allTarget.empty()) { @@ -955,7 +955,7 @@ std::string cmExtraEclipseCDT4Generator::EscapeForXML(const std::string& value) // Helper functions //---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator -::AppendStorageScanners(cmGeneratedFileStream& fout, +::AppendStorageScanners(cmGeneratedFileStream& fout, const cmMakefile& makefile) { // we need the "make" and the C (or C++) compiler which are used, Alex @@ -972,7 +972,7 @@ void cmExtraEclipseCDT4Generator // the following right now hardcodes gcc behaviour :-/ - fout << + fout << "<storageModule moduleId=\"scannerConfiguration\">\n" "<autodiscovery enabled=\"true\" problemReportingEnabled=\"true\"" " selectedProfileId=" @@ -996,8 +996,8 @@ void cmExtraEclipseCDT4Generator // of that is to sort the targets in the view of Eclipse, so that at first // the global/utility/all/clean targets appear ": ", then the executable // targets "[exe] ", then the libraries "[lib]", then the rules for the -// object files "[obj]", then for preprocessing only "[pre] " and -// finally the assembly files "[to asm] ". Note the "to" in "to asm", +// object files "[obj]", then for preprocessing only "[pre] " and +// finally the assembly files "[to asm] ". Note the "to" in "to asm", // without it, "asm" would be the first targets in the list, with the "to" // they are the last targets, which makes more sense. void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout, @@ -1006,7 +1006,7 @@ void cmExtraEclipseCDT4Generator::AppendTarget(cmGeneratedFileStream& fout, const std::string& path, const char* prefix) { - fout << + fout << "<target name=\"" << prefix << target << "\"" " path=\"" << path.c_str() << "\"" " targetID=\"org.eclipse.cdt.make.MakeTargetBuilder\">\n" @@ -1033,7 +1033,7 @@ void cmExtraEclipseCDT4Generator bool runActionUseDefault, bool sipParserEnabled) { - fout << + fout << "<profile id=\"" << profileID << "\">\n" "<buildOutputProvider>\n" "<openAction enabled=\"" << (openActionEnabled ? "true" : "false") |