Consolidate external libraries

Builds/CMake/deps/Ed25519-donna.cmake

@@ -3,13 +3,13 @@
 #]===================================================================]
 
 add_library (ed25519-donna STATIC
-  src/ed25519-donna/ed25519.c)
+  external/ed25519-donna/ed25519.c)
 target_include_directories (ed25519-donna
   PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/external>
     $<INSTALL_INTERFACE:include>
   PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ed25519-donna)
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/ed25519-donna)
 #[=========================================================[
    NOTE for macos:
    https://github.com/floodyberry/ed25519-donna/issues/29
@@ -24,5 +24,5 @@ target_link_libraries (ripple_libs INTERFACE NIH::ed25519-donna)
 #]===========================]
 install (
   FILES
-    src/ed25519-donna/ed25519.h
+    external/ed25519-donna/ed25519.h
   DESTINATION include/ed25519-donna)

Builds/CMake/deps/Secp256k1.cmake

@@ -24,7 +24,7 @@ else()
   set(INSTALL_SECP256K1 true)
 
   add_library (secp256k1 STATIC
-    src/secp256k1/src/secp256k1.c)
+    external/secp256k1/src/secp256k1.c)
   target_compile_definitions (secp256k1
     PRIVATE
       USE_NUM_NONE
@@ -34,9 +34,9 @@ else()
       USE_SCALAR_INV_BUILTIN)
   target_include_directories (secp256k1
     PUBLIC
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/external>
       $<INSTALL_INTERFACE:include>
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/secp256k1)
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/external/secp256k1)
   target_compile_options (secp256k1
     PRIVATE
       $<$<BOOL:${MSVC}>:-wd4319>
@@ -51,7 +51,7 @@ else()
 #]===========================]
   install (
     FILES
-      src/secp256k1/include/secp256k1.h
+      external/secp256k1/include/secp256k1.h
   DESTINATION include/secp256k1/include)
 
   add_library (NIH::secp256k1 ALIAS secp256k1)

CMakeLists.txt

@@ -83,9 +83,9 @@ include(RippledInterface)
 ###
 if (NOT USE_CONAN)
   set(SECP256K1_INSTALL TRUE)
-  add_subdirectory(src/secp256k1)
+  add_subdirectory(external/secp256k1)
   add_library(secp256k1::secp256k1 ALIAS secp256k1)
-  add_subdirectory(src/ed25519-donna)
+  add_subdirectory(external/ed25519-donna)
   include(deps/Boost)
   include(deps/OpenSSL)
   # include(deps/Secp256k1)
@@ -110,9 +110,9 @@ else()
     INTERFACE_COMPILE_DEFINITIONS OPENSSL_NO_SSL2
   )
   set(SECP256K1_INSTALL TRUE)
-  add_subdirectory(src/secp256k1)
+  add_subdirectory(external/secp256k1)
   add_library(secp256k1::secp256k1 ALIAS secp256k1)
-  add_subdirectory(src/ed25519-donna)
+  add_subdirectory(external/ed25519-donna)
   find_package(lz4 REQUIRED)
   # Target names with :: are not allowed in a generator expression.
   # We need to pull the include directories and imported location properties

external/README.md

@@ -0,0 +1,11 @@
+The subdirectories in this directory contain either copies or Conan recipes
+of external libraries used by rippled.
+The Conan recipes include patches we have not yet pushed upstream.
+
+| Folder          | Upstream                                     | Description |
+|:----------------|:---------------------------------------------|:------------|
+| `ed25519-donna` | [Project](https://github.com/floodyberry/ed25519-donna) | [Ed25519](http://ed25519.cr.yp.to/) digital signatures |
+| `rocksdb`       | [Recipe](https://github.com/conan-io/conan-center-index/tree/master/recipes/rocksdb) | Fast key/value database. (Supports rotational disks better than NuDB.) |
+| `secp256k1`     | [Project](https://github.com/bitcoin-core/secp256k1)    | ECDSA digital signatures using the **secp256k1** curve |
+| `snappy`        | [Recipe](https://github.com/conan-io/conan-center-index/tree/master/recipes/snappy)  | "Snappy" lossless compression algorithm. |
+| `soci`          | [Recipe](https://github.com/conan-io/conan-center-index/tree/master/recipes/soci)    | Abstraction layer for database access. |