mujx · heirecka · Sep 14, 2018 · Sep 14, 2018 · Sep 14, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,15 +47,47 @@ if(NOT MSVC AND NOT APPLE)
   find_package(Threads REQUIRED)
 endif()
 
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(Olm 2 REQUIRED)
-find_package(sodium REQUIRED)
+include(FeatureSummary)
+
+find_package(OpenSSL)
+set_package_properties(OpenSSL PROPERTIES
+    DESCRIPTION "Open source SSL and TLS implementation and cryptographic library"
+    URL "https://www.openssl.org/"
+    TYPE REQUIRED
+)
+
+find_package(ZLIB)
+set_package_properties(ZLIB PROPERTIES
+    DESCRIPTION "A free compression library unencumbered by patents"
+    URL "https://www.zlib.net/"
+    TYPE REQUIRED
+)
+
+find_package(Olm 2)
+set_package_properties(Olm PROPERTIES
+    DESCRIPTION "An implementation of the Double Ratchet cryptographic ratchet"
+    URL "https://git.matrix.org/git/olm/about/"
+    TYPE REQUIRED
+)
+
+find_package(sodium)
+set_package_properties(sodium PROPERTIES
+    DESCRIPTION "A modern, portable, easy to use crypto library"
+    URL "https://github.com/jedisct1/libsodium"
+    TYPE REQUIRED
+)
+
+find_package(nlohmann_json 3.2.0)
+set_package_properties(nlohmann_json PROPERTIES
+    DESCRIPTION "JSON for Modern C++, a C++11 header-only JSON class"
+    URL "https://nlohmann.github.io/json/"
+    TYPE REQUIRED
+)
 
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_STATIC_RUNTIME OFF)
 set(Boost_USE_MULTITHREADED ON)
-find_package(Boost 1.66 REQUIRED
+find_package(Boost 1.66
              COMPONENTS atomic
                         chrono
                         date_time
@@ -64,6 +96,11 @@ find_package(Boost 1.66 REQUIRED
                         regex
                         system
                         thread)
+set_package_properties(Boost PROPERTIES
+    DESCRIPTION "Free peer-reviewed portable C++ source libraries"
+    URL "https://www.boost.org/"
+    TYPE REQUIRED
+)
 
 add_library(matrix_client
             lib/http/client.cpp
@@ -153,6 +190,8 @@ if(BUILD_LIB_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
 #
 # Installation & Target configuration.
 #

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -53,7 +53,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}/nlohmann/include/json.hpp
      EXPECTED_HASH SHA256=${JSON_HEADER_HASH})
 
 if(USE_BUNDLED_BOOST)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,9 @@
-find_package(spdlog 1.0.0 CONFIG REQUIRED)
+find_package(spdlog 1.0.0 CONFIG)
+set_package_properties(spdlog PROPERTIES
+    DESCRIPTION "Very fast, header only, C++ logging library"
+    URL "https://github.com/gabime/spdlog"
+    TYPE REQUIRED
+)
 
 include_directories(../tests)
 

diff --git a/examples/crypto_bot.cpp b/examples/crypto_bot.cpp
@@ -11,7 +11,7 @@
 #include <atomic>
 #include <fstream>
 #include <iostream>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <stdexcept>
 #include <unistd.h>
 

diff --git a/examples/simple_bot.cpp b/examples/simple_bot.cpp
@@ -3,7 +3,7 @@
 #include <boost/variant.hpp>
 
 #include <iostream>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <unistd.h>
 
 #include <mtx.hpp>

diff --git a/include/mtx/common.hpp b/include/mtx/common.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <map>
 #include <string>

diff --git a/include/mtx/errors.hpp b/include/mtx/errors.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events.hpp b/include/mtx/events.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <iostream>
 

diff --git a/include/mtx/events/aliases.hpp b/include/mtx/events/aliases.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/avatar.hpp b/include/mtx/events/avatar.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/canonical_alias.hpp b/include/mtx/events/canonical_alias.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/common.hpp b/include/mtx/events/common.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/create.hpp b/include/mtx/events/create.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/encrypted.hpp b/include/mtx/events/encrypted.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/events.hpp"
 

diff --git a/include/mtx/events/encryption.hpp b/include/mtx/events/encryption.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 

diff --git a/include/mtx/events/guest_access.hpp b/include/mtx/events/guest_access.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/history_visibility.hpp b/include/mtx/events/history_visibility.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/join_rules.hpp b/include/mtx/events/join_rules.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/member.hpp b/include/mtx/events/member.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/messages/audio.hpp b/include/mtx/events/messages/audio.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

diff --git a/include/mtx/events/messages/emote.hpp b/include/mtx/events/messages/emote.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/messages/file.hpp b/include/mtx/events/messages/file.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

diff --git a/include/mtx/events/messages/image.hpp b/include/mtx/events/messages/image.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

diff --git a/include/mtx/events/messages/notice.hpp b/include/mtx/events/messages/notice.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/messages/text.hpp b/include/mtx/events/messages/text.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/messages/video.hpp b/include/mtx/events/messages/video.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 #include "mtx/events/common.hpp"

diff --git a/include/mtx/events/name.hpp b/include/mtx/events/name.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/pinned_events.hpp b/include/mtx/events/pinned_events.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/power_levels.hpp b/include/mtx/events/power_levels.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/redaction.hpp b/include/mtx/events/redaction.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/tag.hpp b/include/mtx/events/tag.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/events/topic.hpp b/include/mtx/events/topic.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
 using json = nlohmann::json;

diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
@@ -3,7 +3,7 @@
 #include <exception>
 #include <iostream>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace identifiers {

diff --git a/include/mtx/requests.hpp b/include/mtx/requests.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <mtx/common.hpp>
 
 using json = nlohmann::json;

diff --git a/include/mtx/responses/common.hpp b/include/mtx/responses/common.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include <string>
 #include <vector>

diff --git a/include/mtx/responses/create_room.hpp b/include/mtx/responses/create_room.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

diff --git a/include/mtx/responses/crypto.hpp b/include/mtx/responses/crypto.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/common.hpp"
 

diff --git a/include/mtx/responses/empty.hpp b/include/mtx/responses/empty.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/identifiers.hpp"
 

diff --git a/include/mtx/responses/groups.hpp b/include/mtx/responses/groups.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 namespace mtx {
 namespace responses {

diff --git a/include/mtx/responses/login.hpp b/include/mtx/responses/login.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 
 #include "mtx/identifiers.hpp"