mirror of
https://github.com/Xahau/xahaud.git
synced 2025-11-20 18:45:55 +00:00
Switch to official date lib repo for date.h
This commit is contained in:
committed by
Nik Bougalis
parent
14075630d4
commit
ce5d901e6e
@@ -143,10 +143,11 @@ target_compile_options (xrpl_core
|
|||||||
target_link_libraries (xrpl_core
|
target_link_libraries (xrpl_core
|
||||||
PUBLIC
|
PUBLIC
|
||||||
OpenSSL::Crypto
|
OpenSSL::Crypto
|
||||||
|
Ripple::boost
|
||||||
|
Ripple::syslibs
|
||||||
NIH::secp256k1
|
NIH::secp256k1
|
||||||
NIH::ed25519-donna
|
NIH::ed25519-donna
|
||||||
Ripple::syslibs
|
date::date
|
||||||
Ripple::boost
|
|
||||||
Ripple::opts)
|
Ripple::opts)
|
||||||
#[=================================[
|
#[=================================[
|
||||||
main/core headers installation
|
main/core headers installation
|
||||||
@@ -169,7 +170,6 @@ install (
|
|||||||
src/ripple/basics/base_uint.h
|
src/ripple/basics/base_uint.h
|
||||||
src/ripple/basics/chrono.h
|
src/ripple/basics/chrono.h
|
||||||
src/ripple/basics/contract.h
|
src/ripple/basics/contract.h
|
||||||
src/ripple/basics/date.h
|
|
||||||
src/ripple/basics/hardened_hash.h
|
src/ripple/basics/hardened_hash.h
|
||||||
src/ripple/basics/strHex.h
|
src/ripple/basics/strHex.h
|
||||||
DESTINATION include/ripple/basics)
|
DESTINATION include/ripple/basics)
|
||||||
|
|||||||
49
Builds/CMake/deps/date.cmake
Normal file
49
Builds/CMake/deps/date.cmake
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
#[===================================================================[
|
||||||
|
NIH dep: date
|
||||||
|
|
||||||
|
the main library is header-only, thus is an INTERFACE lib in CMake.
|
||||||
|
|
||||||
|
NOTE: this has been accepted into c++20 so can likely be replaced
|
||||||
|
when we update to that standard
|
||||||
|
#]===================================================================]
|
||||||
|
|
||||||
|
find_package (date QUIET)
|
||||||
|
if (NOT TARGET date::date)
|
||||||
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
|
||||||
|
FetchContent_Declare(
|
||||||
|
hh_date_src
|
||||||
|
GIT_REPOSITORY https://github.com/HowardHinnant/date.git
|
||||||
|
GIT_TAG 48f1455cd255df2fe73b5f293b47203ad0988199
|
||||||
|
)
|
||||||
|
FetchContent_MakeAvailable(hh_date_src)
|
||||||
|
else ()
|
||||||
|
ExternalProject_Add (hh_date_src
|
||||||
|
PREFIX ${nih_cache_path}
|
||||||
|
GIT_REPOSITORY https://github.com/HowardHinnant/date.git
|
||||||
|
GIT_TAG 48f1455cd255df2fe73b5f293b47203ad0988199
|
||||||
|
CONFIGURE_COMMAND ""
|
||||||
|
BUILD_COMMAND ""
|
||||||
|
TEST_COMMAND ""
|
||||||
|
INSTALL_COMMAND ""
|
||||||
|
)
|
||||||
|
ExternalProject_Get_Property (hh_date_src SOURCE_DIR)
|
||||||
|
set (hh_date_src_SOURCE_DIR "${SOURCE_DIR}")
|
||||||
|
file (MAKE_DIRECTORY ${hh_date_src_SOURCE_DIR}/include)
|
||||||
|
add_library (date_interface INTERFACE)
|
||||||
|
add_library (date::date ALIAS date_interface)
|
||||||
|
add_dependencies (date_interface hh_date_src)
|
||||||
|
file (TO_CMAKE_PATH "${hh_date_src_SOURCE_DIR}" hh_date_src_SOURCE_DIR)
|
||||||
|
target_include_directories (date_interface
|
||||||
|
SYSTEM INTERFACE
|
||||||
|
$<BUILD_INTERFACE:${hh_date_src_SOURCE_DIR}/include>
|
||||||
|
$<INSTALL_INTERFACE:include>)
|
||||||
|
install (
|
||||||
|
FILES
|
||||||
|
${hh_date_src_SOURCE_DIR}/include/date/date.h
|
||||||
|
DESTINATION include/date)
|
||||||
|
install (TARGETS date_interface
|
||||||
|
EXPORT RippleExports
|
||||||
|
INCLUDES DESTINATION include)
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
@@ -52,6 +52,7 @@ include(deps/Soci)
|
|||||||
include(deps/Snappy)
|
include(deps/Snappy)
|
||||||
include(deps/Rocksdb)
|
include(deps/Rocksdb)
|
||||||
include(deps/Nudb)
|
include(deps/Nudb)
|
||||||
|
include(deps/date)
|
||||||
include(deps/Protobuf)
|
include(deps/Protobuf)
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|||||||
@@ -20,10 +20,11 @@
|
|||||||
#include <ripple/app/ledger/LedgerToJson.h>
|
#include <ripple/app/ledger/LedgerToJson.h>
|
||||||
#include <ripple/app/misc/TxQ.h>
|
#include <ripple/app/misc/TxQ.h>
|
||||||
#include <ripple/basics/base_uint.h>
|
#include <ripple/basics/base_uint.h>
|
||||||
#include <ripple/basics/date.h>
|
|
||||||
#include <ripple/rpc/Context.h>
|
#include <ripple/rpc/Context.h>
|
||||||
#include <ripple/rpc/DeliveredAmount.h>
|
#include <ripple/rpc/DeliveredAmount.h>
|
||||||
|
|
||||||
|
#include <date/date.h>
|
||||||
|
|
||||||
namespace ripple {
|
namespace ripple {
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|||||||
@@ -19,13 +19,14 @@
|
|||||||
|
|
||||||
#include <ripple/app/misc/ValidatorList.h>
|
#include <ripple/app/misc/ValidatorList.h>
|
||||||
#include <ripple/basics/base64.h>
|
#include <ripple/basics/base64.h>
|
||||||
#include <ripple/basics/date.h>
|
|
||||||
#include <ripple/basics/Slice.h>
|
#include <ripple/basics/Slice.h>
|
||||||
#include <ripple/basics/StringUtilities.h>
|
#include <ripple/basics/StringUtilities.h>
|
||||||
#include <ripple/json/json_reader.h>
|
#include <ripple/json/json_reader.h>
|
||||||
#include <ripple/protocol/jss.h>
|
#include <ripple/protocol/jss.h>
|
||||||
#include <boost/regex.hpp>
|
#include <boost/regex.hpp>
|
||||||
|
|
||||||
|
#include <date/date.h>
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <shared_mutex>
|
#include <shared_mutex>
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -20,7 +20,7 @@
|
|||||||
#ifndef BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
|
#ifndef BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
|
||||||
#define BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
|
#define BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
|
||||||
|
|
||||||
#include <ripple/basics/date.h>
|
#include <date/date.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
#include <ripple/beast/insight/EventImpl.h>
|
#include <ripple/beast/insight/EventImpl.h>
|
||||||
|
|
||||||
#include <ripple/basics/date.h>
|
#include <date/date.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|||||||
@@ -19,9 +19,10 @@
|
|||||||
|
|
||||||
#include <ripple/basics/Log.h>
|
#include <ripple/basics/Log.h>
|
||||||
#include <ripple/basics/UptimeClock.h>
|
#include <ripple/basics/UptimeClock.h>
|
||||||
#include <ripple/basics/date.h>
|
|
||||||
#include <ripple/core/LoadMonitor.h>
|
#include <ripple/core/LoadMonitor.h>
|
||||||
|
|
||||||
|
#include <date/date.h>
|
||||||
|
|
||||||
namespace ripple {
|
namespace ripple {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user