mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-08 12:30:00 -05:00
Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui * Support multiple external module folders (closes #31) * Cleaning up CMake files * Restructure application specification * Add parameter for library mode to all modules * Add functions to handle global variable state * Misc/remove warnings (#383) * Increase build timeout and do a clean rebuild every commit
This commit is contained in:
@@ -101,8 +101,8 @@ namespace documentation {
|
||||
|
||||
const std::string DocumentationEntry::Wildcard = "*";
|
||||
|
||||
SpecificationError::SpecificationError(TestResult res, std::string component)
|
||||
: ghoul::RuntimeError("Error in specification", std::move(component))
|
||||
SpecificationError::SpecificationError(TestResult res, std::string comp)
|
||||
: ghoul::RuntimeError("Error in specification", std::move(comp))
|
||||
, result(std::move(res))
|
||||
{
|
||||
ghoul_assert(!result.success, "Result's success must be false");
|
||||
@@ -125,24 +125,24 @@ DocumentationEntry::DocumentationEntry(std::string k, std::shared_ptr<Verifier>
|
||||
ghoul_assert(verifier, "Verifier must not be nullptr");
|
||||
}
|
||||
|
||||
DocumentationEntry::DocumentationEntry(std::string key, Verifier* v, Optional optional,
|
||||
DocumentationEntry::DocumentationEntry(std::string k, Verifier* v, Optional opt,
|
||||
std::string doc)
|
||||
: DocumentationEntry(std::move(key), std::shared_ptr<Verifier>(v), optional,
|
||||
: DocumentationEntry(std::move(k), std::shared_ptr<Verifier>(v), opt,
|
||||
std::move(doc))
|
||||
{}
|
||||
|
||||
Documentation::Documentation(std::string n, std::string id, DocumentationEntries entries)
|
||||
Documentation::Documentation(std::string n, std::string i, DocumentationEntries ents)
|
||||
: name(std::move(n))
|
||||
, id(std::move(id))
|
||||
, entries(std::move(entries))
|
||||
, id(std::move(i))
|
||||
, entries(std::move(ents))
|
||||
{}
|
||||
|
||||
Documentation::Documentation(std::string n, DocumentationEntries entries)
|
||||
: Documentation(n, "", entries)
|
||||
Documentation::Documentation(std::string n, DocumentationEntries ents)
|
||||
: Documentation(n, "", ents)
|
||||
{}
|
||||
|
||||
Documentation::Documentation(DocumentationEntries entries)
|
||||
: Documentation("", "", entries)
|
||||
Documentation::Documentation(DocumentationEntries ents)
|
||||
: Documentation("", "", ents)
|
||||
{}
|
||||
|
||||
TestResult testSpecification(const Documentation& d, const ghoul::Dictionary& dict) {
|
||||
|
||||
@@ -50,13 +50,13 @@ namespace openspace::documentation {
|
||||
DocumentationEngine* DocumentationEngine::_instance = nullptr;
|
||||
|
||||
DocumentationEngine::DuplicateDocumentationException::DuplicateDocumentationException(
|
||||
Documentation documentation)
|
||||
Documentation doc)
|
||||
: ghoul::RuntimeError(fmt::format(
|
||||
"Duplicate Documentation with name '{}' and id '{}'",
|
||||
documentation.name,
|
||||
documentation.id
|
||||
doc.name,
|
||||
doc.id
|
||||
))
|
||||
, documentation(std::move(documentation))
|
||||
, documentation(std::move(doc))
|
||||
{}
|
||||
|
||||
DocumentationEngine::DocumentationEngine()
|
||||
|
||||
@@ -280,9 +280,9 @@ std::string ReferencingVerifier::documentation() const {
|
||||
return "Referencing Documentation: '"s + identifier + "'";
|
||||
}
|
||||
|
||||
AndVerifier::AndVerifier(Verifier* lhs, Verifier* rhs)
|
||||
: lhs(lhs)
|
||||
, rhs(rhs)
|
||||
AndVerifier::AndVerifier(Verifier* l, Verifier* r)
|
||||
: lhs(l)
|
||||
, rhs(r)
|
||||
{
|
||||
ghoul_assert(lhs, "lhs must not be nullptr");
|
||||
ghoul_assert(rhs, "rhs must not be nullptr");
|
||||
@@ -315,9 +315,9 @@ std::string AndVerifier::documentation() const {
|
||||
return lhs->documentation() + " and " + rhs->documentation();
|
||||
}
|
||||
|
||||
OrVerifier::OrVerifier(Verifier* lhs, Verifier* rhs)
|
||||
: lhs(lhs)
|
||||
, rhs(rhs)
|
||||
OrVerifier::OrVerifier(Verifier* l, Verifier* r)
|
||||
: lhs(l)
|
||||
, rhs(r)
|
||||
{
|
||||
ghoul_assert(lhs, "lhs must not be nullptr");
|
||||
ghoul_assert(rhs, "rhs must not be nullptr");
|
||||
|
||||
Reference in New Issue
Block a user