test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-11-30 02:48:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compile error on ubuntu20.04

Browse Source
This commit is contained in:
fasiondog 2021-04-02 15:49:21 +00:00
parent 75a9353826
commit beea090977
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hikyuu_cpp/hikyuu/data_driver/kdata/hdf5/H5KDataDriver.cpp
View File

@ -261,7 +261,7 @@ bool H5KDataDriver::_getH5FileAndGroup(const string& market, const string& code,
return false;
}
} catch (...) {
HKU_ERROR("Exception of some HDF5 operator!");
// HKU_ERROR("Exception of some HDF5 operator!");
return false;
}
@ -283,8 +283,8 @@ size_t H5KDataDriver::getCount(const string& market, const string& code, KQuery:
dataspace.close();
dataset.close();
} catch (...) {
HKU_WARN("Exception of some HDF5 operator! stock: {}{} {}", market, code,
KQuery::getKTypeName(kType));
// HKU_WARN("Exception of some HDF5 operator! stock: {}{} {}", market, code,
// KQuery::getKTypeName(kType));
total = 0;
}

6
hikyuu_cpp/hikyuu/xmake.lua
View File

@ -90,5 +90,11 @@ You need to specify where the boost headers is via the BOOST_ROOT variable!]])
assert(os.getenv("BOOST_LIB"), [[Missing environment variable: BOOST_LIB
You need to specify where the boost library is via the BOOST_LIB variable!]])
end)
after_build(function(target)
if is_plat("linux") then
os.cp("$(env BOOST_LIB)/libboost_*.so.*", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")
end
end)
target_end()

5
hikyuu_cpp/unit_test/xmake.lua
View File

@ -39,7 +39,8 @@ target("unit-test")
if is_plat("linux") or is_plat("macosx") then
add_links("boost_unit_test_framework")
--add_links("boost_system")
add_links("boost_filesystem")
add_links("boost_serialization")
add_shflags("-Wl,-rpath=$ORIGIN", "-Wl,-rpath=$ORIGIN/../lib")
end
@ -84,7 +85,7 @@ target("small-test")
if is_plat("linux") or is_plat("macosx") then
add_links("boost_unit_test_framework")
--add_links("boost_system")
add_links("boost_filesystem")
add_shflags("-Wl,-rpath=$ORIGIN", "-Wl,-rpath=$ORIGIN/../lib")
end

7
hikyuu_pywrap/strategy/_StrategyBase.cpp
View File

@ -93,8 +93,8 @@ public:
const string& (StrategyBase::*strategy_get_name)() const = &StrategyBase::name;
void (StrategyBase::*strategy_set_name)(const string&) = &StrategyBase::name;
Datetime (StrategyBase::*get_start_datetime)() const = &StrategyBase::startDatetime;
void (StrategyBase::*set_start_datetime)(const Datetime&) = &StrategyBase::startDatetime;
Datetime (StrategyBase::*get_strategy_start_datetime)() const = &StrategyBase::startDatetime;
void (StrategyBase::*set_strategy_start_datetime)(const Datetime&) = &StrategyBase::startDatetime;
void setStockList(StrategyBase* self, object seq) {
vector<string> stk_list;
@ -126,7 +126,8 @@ void export_Strategy() {
make_function(strategy_get_name, return_value_policy<copy_const_reference>()),
strategy_set_name)
.add_property("tm", &StrategyBase::getTM, &StrategyBase::setTM, "账户管理")
.add_property("start_datetime", get_start_datetime, set_start_datetime, "起始日期")
.add_property("start_datetime", get_strategy_start_datetime, set_strategy_start_datetime,
"起始日期")
.add_property(
"stock_list",
make_function(&StrategyBase::getStockCodeList, return_value_policy<copy_const_reference>()),

6
scripts/before_run.lua
View File

@ -29,9 +29,9 @@ function main(target)
os.cp("$(projectdir)/hikyuu_extern_libs/pkg/mysql.pkg/lib/$(mode)/$(plat)/$(arch)/*.dll", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")
end
if is_plat("linux") then
os.cp("$(env BOOST_LIB)/libboost_*.so.*", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")
end
--if is_plat("linux") then
-- os.cp("$(env BOOST_LIB)/libboost_*.so.*", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")
--end
if is_plat("macosx") then
os.cp("$(env BOOST_LIB)/libboost_*.dylib", "$(buildir)/$(mode)/$(plat)/$(arch)/lib/")

2
xmake.lua
View File

@ -39,7 +39,7 @@ add_plugindirs("./xmake_plugins")
add_requires("fmt", {system=false, configs = {header_only = true, vs_runtime = "MD"}})
add_requires("spdlog", {system=false, configs = {header_only = true, fmt_external=true, vs_runtime = "MD"}})
add_requires("flatbuffers", {system=false, configs = {vs_runtime="MD"}})
add_requires("nng", {system=false, configs = {vs_runtime="MD"}})
add_requires("nng", {system=false, configs = {vs_runtime="MD", cxflags="-fPIC"}})
add_requires("nlohmann_json", {system=false})
add_requires("cpp-httplib", {system=false})