Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
17773138
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
17773138
编写于
6月 30, 2019
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Own CMakeLists for H3 because otherwise "m" library does not link correctly
上级
7181ecab
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
2 deletion
+29
-2
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+1
-1
contrib/h3-cmake/CMakeLists.txt
contrib/h3-cmake/CMakeLists.txt
+27
-0
dbms/src/Functions/geoToH3.cpp
dbms/src/Functions/geoToH3.cpp
+1
-1
未找到文件。
contrib/CMakeLists.txt
浏览文件 @
17773138
...
...
@@ -107,7 +107,7 @@ if (USE_INTERNAL_CPUID_LIBRARY)
endif
()
if
(
USE_INTERNAL_H3_LIBRARY
)
add_subdirectory
(
h3
)
add_subdirectory
(
h3
-cmake
)
endif
()
if
(
USE_INTERNAL_SSL_LIBRARY
)
...
...
contrib/h3-cmake/CMakeLists.txt
0 → 100644
浏览文件 @
17773138
set
(
H3_SOURCE_DIR
${
ClickHouse_SOURCE_DIR
}
/contrib/h3/src/h3lib
)
set
(
H3_BINARY_DIR
${
ClickHouse_BINARY_DIR
}
/contrib/h3/src/h3lib
)
set
(
SRCS
${
H3_SOURCE_DIR
}
/lib/algos.c
${
H3_SOURCE_DIR
}
/lib/baseCells.c
${
H3_SOURCE_DIR
}
/lib/bbox.c
${
H3_SOURCE_DIR
}
/lib/coordijk.c
${
H3_SOURCE_DIR
}
/lib/faceijk.c
${
H3_SOURCE_DIR
}
/lib/geoCoord.c
${
H3_SOURCE_DIR
}
/lib/h3Index.c
${
H3_SOURCE_DIR
}
/lib/h3UniEdge.c
${
H3_SOURCE_DIR
}
/lib/linkedGeo.c
${
H3_SOURCE_DIR
}
/lib/localij.c
${
H3_SOURCE_DIR
}
/lib/mathExtensions.c
${
H3_SOURCE_DIR
}
/lib/polygon.c
${
H3_SOURCE_DIR
}
/lib/vec2d.c
${
H3_SOURCE_DIR
}
/lib/vec3d.c
${
H3_SOURCE_DIR
}
/lib/vertexGraph.c
)
configure_file
(
${
H3_SOURCE_DIR
}
/include/h3api.h.in
${
H3_BINARY_DIR
}
/include/h3api.h
)
add_library
(
h3
${
SRCS
}
)
target_include_directories
(
h3 SYSTEM PUBLIC
${
H3_SOURCE_DIR
}
/include
)
target_include_directories
(
h3 SYSTEM PUBLIC
${
H3_BINARY_DIR
}
/include
)
target_compile_definitions
(
h3 PRIVATE H3_HAVE_VLA
)
dbms/src/Functions/geoToH3.cpp
浏览文件 @
17773138
...
...
@@ -111,10 +111,10 @@ public:
}
}
const
auto
col_lat
=
block
.
getByPosition
(
arguments
[
0
]).
column
.
get
();
const
auto
col_lon
=
block
.
getByPosition
(
arguments
[
1
]).
column
.
get
();
const
auto
col_res
=
block
.
getByPosition
(
arguments
[
2
]).
column
.
get
();
if
(
const_cnt
==
0
)
{
const
auto
col_vec_lat
=
static_cast
<
const
ColumnVector
<
Float64
>
*>
(
col_lat
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录