Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
6fb444f7
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
6fb444f7
编写于
3月 29, 2021
作者:
M
Maksim Kita
提交者:
GitHub
3月 29, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20184 from nvartolomei/nv/macos-shared
Fix macOS shared lib build
上级
9fd1577c
479b45d7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
6 deletion
+23
-6
base/common/CMakeLists.txt
base/common/CMakeLists.txt
+4
-0
base/daemon/CMakeLists.txt
base/daemon/CMakeLists.txt
+5
-0
programs/obfuscator/Obfuscator.cpp
programs/obfuscator/Obfuscator.cpp
+4
-4
src/CMakeLists.txt
src/CMakeLists.txt
+10
-2
未找到文件。
base/common/CMakeLists.txt
浏览文件 @
6fb444f7
...
...
@@ -47,6 +47,10 @@ endif()
target_include_directories
(
common PUBLIC ..
${
CMAKE_CURRENT_BINARY_DIR
}
/..
)
if
(
OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES
)
target_link_libraries
(
common PUBLIC -Wl,-U,_inside_main
)
endif
()
# Allow explicit fallback to readline
if
(
NOT ENABLE_REPLXX AND ENABLE_READLINE
)
message
(
STATUS
"Attempt to fallback to readline explicitly"
)
...
...
base/daemon/CMakeLists.txt
浏览文件 @
6fb444f7
...
...
@@ -5,6 +5,11 @@ add_library (daemon
)
target_include_directories
(
daemon PUBLIC ..
)
if
(
OS_DARWIN AND NOT MAKE_STATIC_LIBRARIES
)
target_link_libraries
(
daemon PUBLIC -Wl,-undefined,dynamic_lookup
)
endif
()
target_link_libraries
(
daemon PUBLIC loggers PRIVATE clickhouse_common_io clickhouse_common_config common
${
EXECINFO_LIBRARIES
}
)
if
(
USE_SENTRY
)
...
...
programs/obfuscator/Obfuscator.cpp
浏览文件 @
6fb444f7
...
...
@@ -100,16 +100,16 @@ class IModel
{
public:
/// Call train iteratively for each block to train a model.
virtual
void
train
(
const
IColumn
&
column
);
virtual
void
train
(
const
IColumn
&
column
)
=
0
;
/// Call finalize one time after training before generating.
virtual
void
finalize
();
virtual
void
finalize
()
=
0
;
/// Call generate: pass source data column to obtain a column with anonymized data as a result.
virtual
ColumnPtr
generate
(
const
IColumn
&
column
);
virtual
ColumnPtr
generate
(
const
IColumn
&
column
)
=
0
;
/// Deterministically change seed to some other value. This can be used to generate more values than were in source.
virtual
void
updateSeed
();
virtual
void
updateSeed
()
=
0
;
virtual
~
IModel
()
=
default
;
};
...
...
src/CMakeLists.txt
浏览文件 @
6fb444f7
...
...
@@ -158,7 +158,11 @@ macro(add_object_library name common_path)
list
(
APPEND all_modules
${
name
}
)
add_headers_and_sources
(
${
name
}
${
common_path
}
)
add_library
(
${
name
}
SHARED
${${
name
}
_sources
}
${${
name
}
_headers
}
)
target_link_libraries
(
${
name
}
PRIVATE -Wl,--unresolved-symbols=ignore-all
)
if
(
OS_DARWIN
)
target_link_libraries
(
${
name
}
PRIVATE -Wl,-undefined,dynamic_lookup
)
else
()
target_link_libraries
(
${
name
}
PRIVATE -Wl,--unresolved-symbols=ignore-all
)
endif
()
endif
()
endmacro
()
...
...
@@ -216,7 +220,11 @@ else()
target_link_libraries
(
clickhouse_interpreters PRIVATE clickhouse_parsers_new jemalloc libdivide
)
list
(
APPEND all_modules dbms
)
# force all split libs to be linked
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_SHARED_LINKER_FLAGS
}
-Wl,--no-as-needed"
)
if
(
OS_DARWIN
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_SHARED_LINKER_FLAGS
}
-Wl,-undefined,error"
)
else
()
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
CMAKE_SHARED_LINKER_FLAGS
}
-Wl,--no-as-needed"
)
endif
()
endif
()
macro
(
dbms_target_include_directories
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录