use system lib instead of submodules when possibile

Author: galeone

CMakeLists.txt

@@ -6,6 +6,7 @@ project (openat VERSION 1.0.0 DESCRIPTION "OpenAT: Open Source Algorithmic Tradi
 #
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+
 # Create compile_commands.json in build dir while compiling
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON )
 
@@ -25,52 +26,15 @@ endif()
 # Build and setup the correct cmake variables for third-party libraries
 #
 
-# Enable ExternalProject CMake module
-include(ExternalProject)
-
 # Build Curlpp
 set(CURLPP "${PROJECT_SOURCE_DIR}/libs/curlpp")
 set(CURLPP_INCLUDE_DIR "${CURLPP}/include")
 add_subdirectory(${CURLPP})
 
-# Json is a header-only library
-set(JSON "${PROJECT_SOURCE_DIR}/libs/nlohmann")
-set(JSON_INCLUDE_DIR "${JSON}")
-
-# Spdlog is a header-only library
-set(SPDLOG "${PROJECT_SOURCE_DIR}/libs/spdlog")
-set(SPDLOG_INCLUDE_DIR "${SPDLOG}/include")
-
 # Rapidxml is a header-only library
 set(RAPIDXML "${PROJECT_SOURCE_DIR}/libs/rapidxml")
 set(RAPIDXML_INCLUDE_DIR "${RAPIDXML}")
 
-# GumboParser uses autogen
-set(GUMBOPARSER "${PROJECT_SOURCE_DIR}/libs/gumbo/parser")
-set(GUMBOPARSER_INCLUDE_DIR "${GUMBOPARSER}/include")
-# The compilation creates the include dir ${GUMBOPARSER}/include
-# and the lib dir ${GUMBOPARSER}/lib
-ExternalProject_Add(gumbo_parser
-    SOURCE_DIR ${GUMBOPARSER}
-    # Compile gumbo-parser
-    CONFIGURE_COMMAND ${GUMBOPARSER}/autogen.sh COMMAND ./configure --prefix=${GUMBOPARSER}
-    PREFIX ${GUMBOPARSER}
-    BUILD_COMMAND ${MAKE}
-    BUILD_IN_SOURCE 1)
-
-
-# Build gumbo-query that uses gumbo and cmake
-set(GUMBOQUERY "${PROJECT_SOURCE_DIR}/libs/gumbo/query")
-set(GUMBOQUERY_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/libs/gumbo") # keep structured includes
-# set variables needed by gumboquery cmakelists
-set(Gumbo_INCLUDE_DIR "${GUMBOPARSER_INCLUDE_DIR}")
-set(Gumbo_static_LIBRARY "${GUMBOPARSER}/lib/libgumbo.a")
-set(Gumbo_LIBRARY "${GUMBOPARSER}/lib/libgumbo.so")
-if(APPLE)
-    set (Gumbo_LIBRARY "${GUMBOPARSER}/lib/libgumbo.dylib")
-endif()
-add_subdirectory(${GUMBOQUERY})
-
 #
 # Build project
 #

README.md

@@ -263,9 +263,22 @@ Clone the repository and make sure to clone the submodules too:
 git clone --recursive https://github.com/galeone/openat
 ```
 
-### Building on UNIX
+### Building on (Arch)linux
 
 ```
+# Install the required dependencies
+
+sudo pacman -S spdlog nlohmann-json gumbo-parser sqlite
+# install gumbo query to your system
+cd libs/gumbo/query/build
+cmake ..
+make
+sudo make install
+# if there are problem with the static library, remove the last line
+# `libfind_process(Gumbo)`
+# from libs/gumbo/query/cmake/FindGumbo.cmake
+cd -
+# i
 mkdir build
 cd build
 cmake ..
@@ -274,16 +287,9 @@ CC=clang CXX=clang++ make
 
 ### Building on macOS
 
-As of october 2017, the version of clang shipped with XCode 9 does not fully
-support C++17. You will need to install gcc from HomeBrew; it will be available
-as `gcc-7` and `g++-7`. Note that the gcc included in XCode is just a gcc 
-frontend with an LLVM (clang) backend; it will not be able to build `at`.
-```
-brew install gcc
-```
-
 Install the needed dependencies and remember to link them:
 ```
+brew install gcc
 brew install openssl sqlite
 brew link sqlite --force
 ```
@@ -339,14 +345,14 @@ target_link_libraries(project_name LINK_PUBLIC
 
 The best way to contribute to OpenAT is via pull request and issues, here on GitHub.
 
-There are a lot of things to do to improve OpenAT (and [openatd:  OpenAT Daemon](https://github.com/galeone/openatd/) too!):
+There are a lot of things to do to improve OpenAT (and [openatd: OpenAT Daemon](https://github.com/galeone/openatd/) too!):
 
 1. **Add implementations of the Market interface**: this is the most important part. More market are implemented and more OpenAT can be useful.
 With more implementation with can easily write trading bot for arbitrage in the easiest way ever.
 2. **Add data sources**: coinmarketcap is a good data source and it works well. But we can try to make OpenAT smarter, collecting any other data that talks about crypto currencies (just think, train a ML model with the stream of collected tweets and news feed... we can do sentiment analysis and many other cool things: a lot of (high quality) data is everything.
 3. **Improve the documentation**: at the time of writing, the only documentation is the README and the comments in the header files. We can do better.
-4. **Unit test**: test the server response it's something hard (especially when you work with idiotic APIs like the shapeshift ones, where a field change it's type from request to reuest): we have to create a mock server and test everything.
-5. **OMG you're using double and not integers everywere!**: yes you're right. But since OpenAT basically collects data and send request to API that accepts JSON, using doubles and integer changes nothing (you have to convert the data to a string in every case). But if you want to change OpenAT making it use integer and the information about the number of meaningful digits you're welcome.
+4. **Unit test**: test the server response it's something hard (especially when you work with idiotic APIs like the shapeshift ones, where a field change it's type from request to request): we have to create a mock server and test everything.
+5. **OMG you're using double and not integers everywhere!**: yes you're right. But since OpenAT basically collects data and send request to API that accepts JSON, using doubles and integer changes nothing (you have to convert the data to a string in every case). But if you want to change OpenAT making it use integer and the information about the number of meaningful digits you're welcome.
 
 Also, if you want to donate instead of contributing with code, feel free do donate ETH at this address: `0xa1d283e77f8308559f62909526ccb2d9444d96fc`
 

cmake/FindGumboQuery.cmake

@@ -0,0 +1,6 @@
+find_path(GUMBO_QUERY_INCLUDE_DIR gq/Document.h)
+find_library(GUMBO_QUERY_SHARED_LIB libgq.so)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GumboQuery REQUIRED_VARS
+    GUMBO_QUERY_SHARED_LIB GUMBO_QUERY_INCLUDE_DIR)

include/at/coinmarketcap.hpp

@@ -15,8 +15,9 @@
 #ifndef AT_COINMARKETCAP_H_
 #define AT_COINMARKETCAP_H_
 
-#include <query/src/Document.h>
-#include <query/src/Node.h>
+#include <gq/Document.h>
+#include <gq/Node.h>
+
 #include <at/exceptions.hpp>
 #include <at/market.hpp>
 #include <at/types.hpp>

include/at/exchange.hpp

@@ -17,8 +17,8 @@
 
 #include <at/request.hpp>
 #include <at/types.hpp>
-#include <json.hpp>
 #include <map>
+#include <nlohmann/json.hpp>
 #include <string>
 #include <utility>
 

include/at/market.hpp

@@ -17,8 +17,8 @@
 
 #include <at/request.hpp>
 #include <at/types.hpp>
-#include <json.hpp>
 #include <map>
+#include <nlohmann/json.hpp>
 #include <string>
 #include <utility>
 

include/at/request.hpp

@@ -16,14 +16,15 @@
 #define AT_REQUEST_H_
 
 #include <curl/curl.h>
+
 #include <at/types.hpp>
 #include <cstring>
 #include <curlpp/Easy.hpp>
 #include <curlpp/Infos.hpp>
 #include <curlpp/Options.hpp>
 #include <curlpp/cURLpp.hpp>
 #include <iostream>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <sstream>
 #include <stdexcept>
 #include <utility>

include/at/types.hpp

@@ -15,8 +15,9 @@
 #ifndef AT_TYPE_H_
 #define AT_TYPE_H_
 
+#include <ctime>
 #include <exception>
-#include <json.hpp>
+#include <nlohmann/json.hpp>
 #include <sstream>
 #include <stdexcept>
 #include <string>

openat.pc.in

@@ -6,36 +6,35 @@ file(GLOB_RECURSE CURRENT_SRC "*.cc")
 
 # Find OpenSSL
 find_package(OpenSSL REQUIRED)
+# sdplog
+find_package(spdlog REQUIRED)
+# gumbo query
+find_package(GumboQuery REQUIRED)
+# JSON
+find_package(nlohmann_json REQUIRED)
 
 # Executable at is the compilation of every .cc in this folder
 # and its subfolders
 
 add_library (openat SHARED "${CURRENT_SRC}")
 set(OPENAT_REQUIRED_INCLUDES
     ${OPENAT_INCLUDE_DIR}
-    ${OPENSSL_INCLUDE_DIR}
-    ${JSON_INCLUDE_DIR}
     ${RAPIDXML_INCLUDE_DIR}
-    ${SPDLOG_INCLUDE_DIR}
     ${CURLPP_INCLUDE_DIR}
-    ${GUMBOPARSER_INCLUDE_DIR}
-    ${GUMBOQUERY_INCLUDE_DIR}
+    ${GUMBO_QUERY_INCLUDE_DIR}
 )
 include_directories(${OPENAT_REQUIRED_INCLUDES})
 # Allows include directories outside this CMake
 set( OPENAT_REQUIRED_INCLUDES ${OPENAT_REQUIRED_INCLUDES} PARENT_SCOPE )
 
-target_link_libraries (openat LINK_PUBLIC
-    curlpp
-    ${CMAKE_THREAD_LIBS_INIT}
-    gumbo_query_shared #defined in CMakeLists of libs/gumbo/query
-    ${OPENSSL_CRYPTO_LIBRARY}
+target_link_libraries (openat PUBLIC
+    curlpp # from submodule
+    Threads::Threads
+    ${GUMBO_QUERY_SHARED_LIB}
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    PRIVATE
+    spdlog::spdlog
+    nlohmann_json::nlohmann_json
+    ${GUMBO_PARSER_SHARED_LIB}
 )
-
-include(GNUInstallDirs)
-configure_file("${PROJECT_SOURCE_DIR}/openat.pc.in" openat.pc @ONLY)
-install(TARGETS openat
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(FILES ${CMAKE_BINARY_DIR}/src/openat.pc
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)