Build: Prefix directory to include of enums.hpp
This fixes a build problem due to the reduced include search paths introduced by my recent changes. Also fix a couple of other includes to use angle brackets.
This commit is contained in:
parent
7f289d14ec
commit
8b2a184327
|
@ -70,7 +70,7 @@ raised, which provides access to the error code and description.
|
||||||
#ifndef LIBSIGROKCXX_HPP
|
#ifndef LIBSIGROKCXX_HPP
|
||||||
#define LIBSIGROKCXX_HPP
|
#define LIBSIGROKCXX_HPP
|
||||||
|
|
||||||
#include "libsigrok/libsigrok.h"
|
#include <libsigrok/libsigrok.h>
|
||||||
#include <glibmm.h>
|
#include <glibmm.h>
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
@ -1047,7 +1047,7 @@ protected:
|
||||||
const string _name;
|
const string _name;
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "enums.hpp"
|
#include <libsigrokcxx/enums.hpp>
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#pragma SWIG nowarn=325,401
|
#pragma SWIG nowarn=325,401
|
||||||
|
|
||||||
%{
|
%{
|
||||||
#include "libsigrokcxx/libsigrokcxx.hpp"
|
#include <libsigrokcxx/libsigrokcxx.hpp>
|
||||||
using namespace std;
|
using namespace std;
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
@ -271,10 +271,10 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
|
||||||
%attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
|
%attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
|
||||||
%attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
|
%attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
|
||||||
|
|
||||||
%include "libsigrokcxx/libsigrokcxx.hpp"
|
%include <libsigrokcxx/libsigrokcxx.hpp>
|
||||||
|
|
||||||
%include "enums.i"
|
%include "enums.i"
|
||||||
|
|
||||||
namespace sigrok {
|
namespace sigrok {
|
||||||
%include "libsigrokcxx/enums.hpp"
|
%include <libsigrokcxx/enums.hpp>
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue