Fix package definition for Conan (#4485)

Fix the libxrpl library target for consumers using Conan.

* Fix installation issues and update includes.
* Update requirements in the Conan package info.
  * libxrpl requires openssl::crypto.

(Conan is a software package manager for C++.)
This commit is contained in:
John Freeman
2023-06-27 03:23:52 -05:00
committed by tequ
parent cd9facd7fa
commit 00a6922045
20 changed files with 79 additions and 32 deletions

View File

@@ -20,7 +20,7 @@
#ifndef RIPPLE_PROTOCOL_SECP256K1_H_INCLUDED
#define RIPPLE_PROTOCOL_SECP256K1_H_INCLUDED
#include <secp256k1/include/secp256k1.h>
#include <secp256k1.h>
namespace ripple {

View File

@@ -24,7 +24,7 @@ target_compile_definitions(secp256k1 PRIVATE
)
target_include_directories(secp256k1
PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
target_compile_options(secp256k1 PRIVATE
$<$<C_COMPILER_ID:MSVC>:-wd4319>

View File

@@ -6,8 +6,8 @@
#include <string.h>
#include "include/secp256k1.h"
#include "include/secp256k1_ecdh.h"
#include "secp256k1.h"
#include "secp256k1_ecdh.h"
#include "util.h"
#include "bench.h"

View File

@@ -5,7 +5,7 @@
**********************************************************************/
#include <stdio.h>
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "util.h"
#include "hash_impl.h"

View File

@@ -4,8 +4,8 @@
* file COPYING or http://www.opensource.org/licenses/mit-license.php.*
**********************************************************************/
#include "include/secp256k1.h"
#include "include/secp256k1_recovery.h"
#include "secp256k1.h"
#include "secp256k1_recovery.h"
#include "util.h"
#include "bench.h"

View File

@@ -7,8 +7,8 @@
#include <stdio.h>
#include <string.h>
#include "include/secp256k1.h"
#include "include/secp256k1_schnorr.h"
#include "secp256k1.h"
#include "secp256k1_schnorr.h"
#include "util.h"
#include "bench.h"

View File

@@ -4,7 +4,7 @@
* file COPYING or http://www.opensource.org/licenses/mit-license.php.*
**********************************************************************/
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "util.h"
#include "bench.h"

View File

@@ -7,7 +7,7 @@
#include <stdio.h>
#include <string.h>
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "util.h"
#include "bench.h"

View File

@@ -7,7 +7,7 @@
#define USE_BASIC_CONFIG 1
#include "basic-config.h"
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "field_impl.h"
#include "scalar_impl.h"
#include "group_impl.h"

View File

@@ -2,9 +2,9 @@
#include <stdint.h>
#include <string.h>
#include "org_bitcoin_NativeSecp256k1.h"
#include "include/secp256k1.h"
#include "include/secp256k1_ecdh.h"
#include "include/secp256k1_recovery.h"
#include "secp256k1.h"
#include "secp256k1_ecdh.h"
#include "secp256k1_recovery.h"
SECP256K1_API jlong JNICALL Java_org_bitcoin_NativeSecp256k1_secp256k1_1ctx_1clone

View File

@@ -1,6 +1,6 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
#include "include/secp256k1.h"
#include "secp256k1.h"
/* Header for class org_bitcoin_NativeSecp256k1 */
#ifndef _Included_org_bitcoin_NativeSecp256k1

View File

@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <stdint.h>
#include "org_bitcoin_Secp256k1Context.h"
#include "include/secp256k1.h"
#include "secp256k1.h"
SECP256K1_API jlong JNICALL Java_org_bitcoin_Secp256k1Context_secp256k1_1init_1context
(JNIEnv* env, jclass classObject)

View File

@@ -1,6 +1,6 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
#include "include/secp256k1.h"
#include "secp256k1.h"
/* Header for class org_bitcoin_Secp256k1Context */
#ifndef _Included_org_bitcoin_Secp256k1Context

View File

@@ -7,7 +7,7 @@
#ifndef _SECP256K1_MODULE_ECDH_MAIN_
#define _SECP256K1_MODULE_ECDH_MAIN_
#include "include/secp256k1_ecdh.h"
#include "secp256k1_ecdh.h"
#include "ecmult_const_impl.h"
int secp256k1_ecdh(const secp256k1_context* ctx, unsigned char *result, const secp256k1_pubkey *point, const unsigned char *scalar) {

View File

@@ -7,7 +7,7 @@
#ifndef _SECP256K1_MODULE_RECOVERY_MAIN_
#define _SECP256K1_MODULE_RECOVERY_MAIN_
#include "include/secp256k1_recovery.h"
#include "secp256k1_recovery.h"
static void secp256k1_ecdsa_recoverable_signature_load(const secp256k1_context* ctx, secp256k1_scalar* r, secp256k1_scalar* s, int* recid, const secp256k1_ecdsa_recoverable_signature* sig) {
(void)ctx;

View File

@@ -4,7 +4,7 @@
* file COPYING or http://www.opensource.org/licenses/mit-license.php.*
**********************************************************************/
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "util.h"
#include "num_impl.h"

View File

@@ -14,7 +14,7 @@
#include <time.h>
#include "secp256k1.c"
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "testrand_impl.h"
#ifdef ENABLE_OPENSSL_TESTS

View File

@@ -21,14 +21,14 @@
#define EXHAUSTIVE_TEST_LAMBDA 9 /* cube root of 1 mod 13 */
#endif
#include "include/secp256k1.h"
#include "secp256k1.h"
#include "group.h"
#include "secp256k1.c"
#include "testrand_impl.h"
#ifdef ENABLE_MODULE_RECOVERY
#include "src/modules/recovery/main_impl.h"
#include "include/secp256k1_recovery.h"
#include "secp256k1_recovery.h"
#endif
/** stolen from tests.c */