Skip to content
This repository has been archived by the owner on Oct 17, 2019. It is now read-only.

Fix up includes to nlohmann json #448

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix up includes to nlohmann json #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b498bb
Fix up includes to nlohmann json
z3ntu Sep 24, 2018
8aae642
Change nlohmann json download location
z3ntu Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ set(JSON_HEADER_URL
set(JSON_HEADER_HASH
ce6b5610a051ec6795fa11c33854abebb086f0fd67c311f5921c3c07f9531b44)

file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/json.hpp
file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/nlohmann/json.hpp
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to use External_Project for this library and install it like the other dependencies. And then call find_package(nlohmann_json) which will fix the CI.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably but it's more work 😉 I'll look into it soon-ish

EXPECTED_HASH SHA256=${JSON_HEADER_HASH})

if(USE_BUNDLED_BOOST)
Expand Down
2 changes: 1 addition & 1 deletion src/Cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <QImage>
#include <QString>

#include <json.hpp>
#include <nlohmann/json.hpp>
#include <lmdb++.h>
#include <mtx/events/join_rules.hpp>
#include <mtx/responses.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/MatrixClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <QObject>
#include <QString>

#include "json.hpp"
#include <nlohmann/json.hpp>
#include <mtx/responses.hpp>
#include <mtxclient/http/client.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/dialogs/RawMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <QVBoxLayout>
#include <QWidget>

#include "json.hpp"
#include <nlohmann/json.hpp>

#include "Logging.h"
#include "MainWindow.h"
Expand Down