Allow including installed jsonrpcpp from a system directory

This commit is contained in:
Jörg Krause 2017-03-15 11:28:26 +01:00 committed by badaix
parent c4e38b60b0
commit f28018ada7
6 changed files with 30 additions and 2 deletions

View file

@ -20,7 +20,12 @@
#define JSON_MESSAGE_H #define JSON_MESSAGE_H
#include "message.h" #include "message.h"
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp" #include "externals/json.hpp"
#endif
using json = nlohmann::json; using json = nlohmann::json;

View file

@ -23,6 +23,10 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <sys/time.h> #include <sys/time.h>
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp" #include "externals/json.hpp"
#include "common/utils/string_utils.h" #include "common/utils/string_utils.h"
#include "common/utils.h" #include "common/utils.h"

View file

@ -16,12 +16,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/jsonrp.hpp>
#else
#include "jsonrp.hpp"
#endif
#include "controlServer.h" #include "controlServer.h"
#include "message/time.h" #include "message/time.h"
#include "aixlog.hpp" #include "aixlog.hpp"
#include "common/utils.h" #include "common/utils.h"
#include "common/snapException.h" #include "common/snapException.h"
#include "jsonrp.hpp"
#include "config.h" #include "config.h"
#include <iostream> #include <iostream>

View file

@ -27,7 +27,12 @@
#include <sstream> #include <sstream>
#include <mutex> #include <mutex>
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/jsonrp.hpp>
#else
#include "jsonrp.hpp" #include "jsonrp.hpp"
#endif
#include "streamSession.h" #include "streamSession.h"
#include "streamreader/streamManager.h" #include "streamreader/streamManager.h"
#include "common/queue.h" #include "common/queue.h"

View file

@ -27,11 +27,15 @@
#include <map> #include <map>
#include "streamUri.h" #include "streamUri.h"
#include "encoder/encoder.h" #include "encoder/encoder.h"
#include "externals/json.hpp"
#include "common/sampleFormat.h" #include "common/sampleFormat.h"
#include "message/codecHeader.h" #include "message/codecHeader.h"
#include "message/streamTags.h" #include "message/streamTags.h"
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp"
#endif
class PcmStream; class PcmStream;

View file

@ -21,7 +21,12 @@
#include <string> #include <string>
#include <map> #include <map>
#ifdef HAS_JSONRPCPP
#include <jsonrpcpp/json.hpp>
#else
#include "externals/json.hpp" #include "externals/json.hpp"
#endif
using json = nlohmann::json; using json = nlohmann::json;