-#include <algorithm>
#include <cstdlib>
+#include <msp/core/algorithm.h>
#include <msp/core/maputils.h>
#include <msp/fs/utils.h>
#include <msp/io/print.h>
#include "sourcepackage.h"
#include "tool.h"
#include "vcxprojectfile.h"
+#include "vssolutionfile.h"
using namespace std;
using namespace Msp;
SourcePackage::~SourcePackage()
{
- for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
- delete *i;
+ for(Component *c: components)
+ delete c;
}
FS::Path SourcePackage::get_temp_directory() const
const Component &SourcePackage::get_component(const string &n) const
{
- for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
- if((*i)->get_name()==n)
- return **i;
+ auto i = find_if(components, [&n](const Component *c){ return c->get_name()==n; });
+ if(i!=components.end())
+ return **i;
throw key_error(n);
}
build_info.incpath.push_back((builder.get_prefix()/"include").str());
build_info.libpath.push_back((builder.get_prefix()/"lib").str());
- for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
+ for(const Feature &f: features)
{
- string ident = "WITH_"+toupper(i->name);
- string value = config.get_option("with_"+i->name).value;
+ string ident = "WITH_"+toupper(f.name);
+ string value = config.get_option("with_"+f.name).value;
- if(i->choices.empty())
+ if(f.choices.empty())
{
if(!lexical_cast<bool>(value))
continue;
}
build_info.defines[ident] = value;
- if(i->exported)
+ if(f.exported)
export_binfo.defines[ident] = value;
}
- for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+ for(Component *c: components)
{
- (*i)->prepare();
- (*i)->create_build_info();
+ c->prepare();
+ c->create_build_info();
- (*i)->update_exported_build_info(export_binfo);
+ c->update_exported_build_info(export_binfo);
}
cache.load();
- for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
- (*i)->create_targets();
+ for(Component *c: components)
+ c->create_targets();
const Architecture &arch = builder.get_native_arch();
if(!export_binfo.libs.empty())
}
}
+ export_binfo.standards = build_info.standards;
+
if(arch.get_system()=="windows")
+ {
new VcxProjectFile(builder, *this);
+ new VsSolutionFile(builder, *this);
+ }
new CompileCommandsJson(builder, *this);
}
{
/* Make sure the source tarball is last in the list so targets from all
other components wil be created first */
- ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_archive);
+ auto i = find(obj.components, obj.source_archive);
if(i!=obj.components.end())
obj.components.splice(obj.components.end(), obj.components, i);
}
const Config::Option &opt = obj.config.add_option(feat);
if(options)
{
- Config::InputOptions::const_iterator i = options->find(opt.name);
+ auto i = options->find(opt.name);
if(i!=options->end())
obj.config.set_option(opt.name, i->second);
}