Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
33347ad9
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,发现更多精彩内容 >>
提交
33347ad9
编写于
1月 30, 2017
作者:
P
proller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cmake: some fixes
上级
7ecfbfe5
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
19 addition
and
5 deletion
+19
-5
CMakeLists.txt
CMakeLists.txt
+2
-2
cmake/find_readline_edit.cmake
cmake/find_readline_edit.cmake
+4
-2
cmake/find_rt.cmake
cmake/find_rt.cmake
+2
-1
cmake/test_compiler.cmake
cmake/test_compiler.cmake
+11
-0
未找到文件。
CMakeLists.txt
浏览文件 @
33347ad9
...
...
@@ -125,12 +125,12 @@ if (NOT APPLE)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
${
GLIBC_COMPATIBILITY_LINK_FLAGS
}
${
CXX11_ABI_FLAGS
}
"
)
endif
()
if
(
USE_STATIC_LIBRARIES AND NOT CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
)
include
(
cmake/test_compiler.cmake
)
if
(
USE_STATIC_LIBRARIES AND HAVE_NO_PIE
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
--no-pie"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
--no-pie"
)
endif
()
set
(
SAN_FLAGS
"-O3 -g -fno-omit-frame-pointer"
)
set
(
CMAKE_CXX_FLAGS_ASAN
"
${
CMAKE_CXX_FLAGS_ASAN
}
${
SAN_FLAGS
}
-fsanitize=address"
)
set
(
CMAKE_C_FLAGS_ASAN
"
${
CMAKE_C_FLAGS_ASAN
}
${
SAN_FLAGS
}
-fsanitize=address"
)
...
...
cmake/find_readline_edit.cmake
浏览文件 @
33347ad9
...
...
@@ -5,12 +5,13 @@ if (NOT READLINE_LIB)
find_library
(
READLINE_LIB NAMES readline PATHS
${
READLINE_PATHS
}
)
endif
()
find_library
(
TERMCAP_LIB NAMES termcap
)
list
(
APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.2
)
find_library
(
TERMCAP_LIB NAMES termcap
)
find_library
(
EDIT_LIB NAMES edit
)
set
(
READLINE_INCLUDE_PATHS
"/usr/local/opt/readline/include"
)
if
(
READLINE_LIB
)
if
(
READLINE_LIB
AND TERMCAP_LIB
)
find_path
(
READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
${
READLINE_INCLUDE_PATHS
}
NO_DEFAULT_PATH
)
if
(
NOT READLINE_INCLUDE_DIR
)
find_path
(
READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS
${
READLINE_INCLUDE_PATHS
}
)
...
...
@@ -40,5 +41,6 @@ check_cxx_source_runs("
int main() {
add_history(nullptr);
append_history(1,nullptr);
return 0;
}
"
HAVE_READLINE_HISTORY
)
cmake/find_rt.cmake
浏览文件 @
33347ad9
if
(
APPLE
)
find_library
(
RT_LIBRARIES apple_rt
)
# lib from libs/libcommon
set
(
RT_LIBRARIES
"apple_rt"
)
else
()
find_library
(
RT_LIBRARIES rt
)
endif
()
...
...
cmake/test_compiler.cmake
0 → 100644
浏览文件 @
33347ad9
include
(
CheckCXXSourceCompiles
)
set
(
TEST_FLAG
"--no-pie"
)
set
(
CMAKE_REQUIRED_FLAGS
"
${
TEST_FLAG
}
"
)
check_cxx_source_compiles
(
"
int main() {
return 0;
}
"
HAVE_NO_PIE
)
set
(
CMAKE_REQUIRED_FLAGS
""
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录