aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore9
-rw-r--r--CMakeLists.txt77
-rw-r--r--README.md14
-rw-r--r--include/client/web_socket_client.hpp3
-rw-r--r--include/nostr.hpp3
-rw-r--r--src/client/websocketpp_client.cpp3
-rw-r--r--src/event.cpp3
-rw-r--r--src/filters.cpp3
8 files changed, 91 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 8138b0a..efb998a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,12 @@ build/
# VS Code Settings
.vscode/
+
+# CMake outputs
+_deps/
+CMakeFiles/
+Makefile
+CTestTestfile.cmake
+CMakeCache.txt
+cmake_install.cmake
+OpenSSL-prefix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca378b8..208265a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,73 @@
cmake_minimum_required(VERSION 3.14)
+cmake_policy(SET CMP0135 NEW)
project(NostrSDK VERSION 0.0.1)
+include(ExternalProject)
+include(FetchContent)
+
# Specify the C++ standard
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/bin/)
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/lib/)
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/lib/)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/_deps)
+
+get_directory_property(HAS_PARENT PARENT_DIRECTORY)
+if(HAS_PARENT)
+ message(STATUS "Configuring as a subproject.")
+
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/bin/)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/lib/)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/../out/${CMAKE_BUILD_TYPE}/lib/)
+ set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/../env/)
+
+ set(Boost_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../env/boost/include)
+else()
+ message(STATUS "Configuring as a standalone project.")
+
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}/bin/)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}/lib/)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}/lib/)
+
+ set(OPENSSL_INCLUDE_DIR ${OPENSSL_ROOT_DIR}/include/)
+ set(OPENSSL_LIBRARIES ${OPENSSL_ROOT_DIR}/lib/)
+endif()
if(DEFINED ENV{WORKSPACE})
- list(APPEND CMAKE_PREFIX_PATH $ENV{WORKSPACE}/env/uuid_v4)
+ list(APPEND CMAKE_PREFIX_PATH $ENV{WORKSPACE}/env)
else()
- list(APPEND CMAKE_PREFIX_PATH ../env/uuid_v4)
+ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/../env)
endif()
-# Build the project.
+#======== Find unmanaged dependencies ========#
+find_package(OpenSSL REQUIRED)
+find_package(Boost REQUIRED COMPONENTS filesystem system thread regex)
+
+#======== Fetch header-only dependencies ========#
+FetchContent_Declare(
+ nlohmann_json
+ URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
+ URL_HASH SHA256=d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
+ USES_TERMINAL_DOWNLOAD TRUE
+)
+FetchContent_Declare(
+ plog
+ URL https://github.com/SergiusTheBest/plog/archive/refs/tags/1.1.10.tar.gz
+ USES_TERMINAL_DOWNLOAD TRUE
+)
+FetchContent_Declare(
+ websocketpp
+ GIT_REPOSITORY git@github.com:zaphoyd/websocketpp.git
+ GIT_TAG 0.8.2
+)
+FetchContent_Declare(
+ uuid_v4
+ URL https://github.com/crashoz/uuid_v4/archive/refs/tags/v1.0.0.tar.gz
+ USES_TERMINAL_DOWNLOAD TRUE
+)
+
+FetchContent_MakeAvailable(nlohmann_json plog uuid_v4 websocketpp)
+
+#======== Build the project ========#
set(INCLUDE_DIR ./include)
set(CLIENT_INCLUDE_DIR ./include/client)
include_directories(${INCLUDE_DIR})
@@ -35,28 +87,21 @@ set(SOURCES
${CLIENT_SOURCE_DIR}/websocketpp_client.cpp
)
-find_package(nlohmann_json CONFIG REQUIRED)
-find_package(uuid_v4 REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(plog CONFIG REQUIRED)
-find_package(websocketpp CONFIG REQUIRED)
-
add_library(NostrSDK ${SOURCES} ${HEADERS})
target_link_libraries(NostrSDK PRIVATE
nlohmann_json::nlohmann_json
OpenSSL::SSL
OpenSSL::Crypto
plog::plog
- websocketpp::websocketpp
uuid_v4::uuid_v4
+ websocketpp::websocketpp
)
set_target_properties(NostrSDK PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES)
-# Build the tests.
+#======== Build the tests ========#
enable_testing()
include(GoogleTest)
-include(FetchContent)
FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
@@ -79,8 +124,8 @@ target_link_libraries(NostrSDKTest PRIVATE
GTest::gtest_main
NostrSDK
plog::plog
- websocketpp::websocketpp
uuid_v4::uuid_v4
+ websocketpp::websocketpp
)
set_target_properties(NostrSDKTest PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES)
diff --git a/README.md b/README.md
index 4445cee..07ef788 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,16 @@
# NostrSDK
+
C++ System Development Kit for Nostr
+
+## Building the SDK
+
+### Prerequisites
+
+- CMake 3.14 or later
+- C++17 compiler
+- OpenSSL 1.1.1 or later
+- Boost 1.85 or later
+
+### Standalone Build
+
+When building this library as a standalone project, the `Boost_INCLUDE_DIR` and `OPENSSL_ROOT_DIR` variables must be set at the CMake configuration step.
diff --git a/include/client/web_socket_client.hpp b/include/client/web_socket_client.hpp
index 6fbede6..63fa634 100644
--- a/include/client/web_socket_client.hpp
+++ b/include/client/web_socket_client.hpp
@@ -3,6 +3,9 @@
#include <functional>
#include <string>
+#include <websocketpp/client.hpp>
+#include <websocketpp/config/asio_client.hpp>
+
namespace client
{
/**
diff --git a/include/nostr.hpp b/include/nostr.hpp
index 5c99bf4..d6d5de1 100644
--- a/include/nostr.hpp
+++ b/include/nostr.hpp
@@ -6,6 +6,9 @@
#include <tuple>
#include <vector>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+
#include <nlohmann/json.hpp>
#include <plog/Log.h>
#include <websocketpp/client.hpp>
diff --git a/src/client/websocketpp_client.cpp b/src/client/websocketpp_client.cpp
index 276c5dd..baae054 100644
--- a/src/client/websocketpp_client.cpp
+++ b/src/client/websocketpp_client.cpp
@@ -1,6 +1,3 @@
-#include <websocketpp/client.hpp>
-#include <websocketpp/config/asio_client.hpp>
-
#include "web_socket_client.hpp"
using std::error_code;
diff --git a/src/event.cpp b/src/event.cpp
index cf6b117..5c98028 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,7 +1,4 @@
#include <ctime>
-#include <openssl/evp.h>
-#include <nlohmann/json.hpp>
-#include <openssl/sha.h>
#include "nostr.hpp"
diff --git a/src/filters.cpp b/src/filters.cpp
index af9960c..cfbc5bf 100644
--- a/src/filters.cpp
+++ b/src/filters.cpp
@@ -1,6 +1,5 @@
-#include <nlohmann/json.hpp>
-
#include "nostr.hpp"
+
using namespace nlohmann;
using namespace std;
generated by cgit (git 2.46.0) at 2024-10-01 17:31:36 +0000