Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[submodule "external/kurlyk"]
path = external/kurlyk
url = https://github.com/NewYaroslav/kurlyk.git
url = https://github.com/LimiNode/kurlyk.git
[submodule "external/asio"]
path = external/asio
url = https://github.com/chriskohlhoff/asio.git
[submodule "external/openssl-win64-v3.4.0"]
path = external/openssl-win64-v3.4.0
url = https://github.com/NewYaroslav/openssl-win64-v3.4.0.git
[submodule "external/curl-8.11.0_1-win64-mingw"]
path = external/curl-8.11.0_1-win64-mingw
url = https://github.com/NewYaroslav/curl-8.11.0_1-win64-mingw.git
[submodule "external/openssl-win64-v3.5.8"]
path = external/openssl-win64-v3.5.8
url = https://github.com/LimiNode/openssl-win64-v3.5.8.git
[submodule "external/curl-8.22.0_1-win64-mingw"]
path = external/curl-8.22.0_1-win64-mingw
url = https://github.com/LimiNode/curl-8.22.0_1-win64-mingw.git
[submodule "external/log-it-cpp"]
path = external/log-it-cpp
url = https://github.com/NewYaroslav/log-it-cpp.git
url = https://github.com/LimiNode/log-it-cpp.git
[submodule "external/Simple-WebSocket-Server"]
path = external/Simple-WebSocket-Server
url = https://gitlab.com/eidheim/Simple-WebSocket-Server.git
Expand All @@ -21,10 +21,10 @@
url = https://github.com/nlohmann/json.git
[submodule "external/time-shield-cpp"]
path = external/time-shield-cpp
url = https://github.com/NewYaroslav/time-shield-cpp.git
url = https://github.com/LimiNode/time-shield-cpp.git
[submodule "external/SimpleNamedPipe"]
path = external/SimpleNamedPipe
url = https://github.com/NewYaroslav/SimpleNamedPipe.git
url = https://github.com/LimiNode/SimpleNamedPipe.git
[submodule "external/AES"]
path = external/AES
url = https://github.com/SergeyBel/AES.git
Expand All @@ -33,7 +33,7 @@
url = https://github.com/google/googletest.git
[submodule "external/mdbx-containers"]
path = external/mdbx-containers
url = https://github.com/NewYaroslav/mdbx-containers.git
url = https://github.com/LimiNode/mdbx-containers.git
[submodule "external/libmdbx"]
path = external/libmdbx
url = https://github.com/Mithril-mine/libmdbx.git
Expand Down
26 changes: 15 additions & 11 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,28 @@ include(${EXTERNAL_CMAKE_DIR}/libmdbx-wrapper.cmake)

if(WIN32)
# openssl
install_headers_to_include(openssl ${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/include/openssl)
install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/lib/VC/x64/MT)
install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.4.0/bin)
install_headers_to_include(openssl ${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/include/openssl)
# The 3.5.8 snapshot ships its x64 import/static libraries in the MD tree.
install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/lib/VC/x64/MD)
install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/openssl-win64-v3.5.8/bin)

# curl
install_headers_to_include(curl ${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/include/curl)
install_headers_to_include(curl ${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/include/curl)

file(GLOB CURL_STATIC_LIBS "${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/lib/*.a")
file(GLOB CURL_STATIC_LIBS "${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/lib/*.a")
# Удаляем libssl.a и libcrypto.a
list(FILTER CURL_STATIC_LIBS EXCLUDE REGEX ".*libssl.a$")
list(FILTER CURL_STATIC_LIBS EXCLUDE REGEX ".*libcrypto.a$")
install_lib_files_to_lib(${CURL_STATIC_LIBS})
# install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/lib)
install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/bin)
file(COPY
${CMAKE_CURRENT_LIST_DIR}/curl-8.11.0_1-win64-mingw/bin/curl-ca-bundle.crt
DESTINATION ${OPTIONX_DEPS_OUTPUT_DIR}/bin
)
# install_static_libs_to_lib(${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/lib)
install_runtime_dlls_to_bin(${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/bin)
set(CURL_CA_BUNDLE "${CMAKE_CURRENT_LIST_DIR}/curl-8.22.0_1-win64-mingw/bin/curl-ca-bundle.crt")
if(EXISTS "${CURL_CA_BUNDLE}")
file(COPY
"${CURL_CA_BUNDLE}"
DESTINATION ${OPTIONX_DEPS_OUTPUT_DIR}/bin
)
endif()
else()
# Non-Windows builds use system OpenSSL/CURL targets from the root
# tests/examples link configuration.
Expand Down
1 change: 0 additions & 1 deletion external/curl-8.11.0_1-win64-mingw
Submodule curl-8.11.0_1-win64-mingw deleted from 840e56
1 change: 1 addition & 0 deletions external/curl-8.22.0_1-win64-mingw
2 changes: 1 addition & 1 deletion external/kurlyk
Submodule kurlyk updated 126 files
2 changes: 1 addition & 1 deletion external/log-it-cpp
Submodule log-it-cpp updated 147 files
1 change: 0 additions & 1 deletion external/openssl-win64-v3.4.0
Submodule openssl-win64-v3.4.0 deleted from 635bbf
1 change: 1 addition & 0 deletions external/openssl-win64-v3.5.8
Submodule openssl-win64-v3.5.8 added at 01e309
2 changes: 1 addition & 1 deletion external/time-shield-cpp
Submodule time-shield-cpp updated 181 files
10 changes: 5 additions & 5 deletions include/optionx_cpp/data/trading/TradeTimeZone.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

#include <cstdint>

#include <time_shield/constants.hpp>
#include <time_shield/date_time_conversions.hpp>
#include <time_shield/enums.hpp>
#include <time_shield/time_zone_conversions.hpp>
#include <time_shield/types.hpp>
#include <time_shield/core/constants.hpp>
#include <time_shield/conversions/date_time_conversions.hpp>
#include <time_shield/core/enums.hpp>
#include <time_shield/timezone/time_zone_conversions.hpp>
#include <time_shield/core/types.hpp>

namespace optionx {

Expand Down
2 changes: 1 addition & 1 deletion include/optionx_cpp/storages/SignalRecordDB/detail.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <utility>

#include <time_shield/time_unit_conversions.hpp>
#include <time_shield/conversions/time_unit_conversions.hpp>

#include "data.hpp"

Expand Down
2 changes: 1 addition & 1 deletion include/optionx_cpp/storages/TradeRecordDB/detail.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <utility>

#include <time_shield/time_unit_conversions.hpp>
#include <time_shield/conversions/time_unit_conversions.hpp>

#include "data.hpp"

Expand Down
Loading