Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
7be750af
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,发现更多精彩内容 >>
提交
7be750af
编写于
7月 20, 2018
作者:
P
proller
提交者:
alexey-milovidov
7月 20, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Apple build fixes
上级
a1684d4a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
22 deletion
+31
-22
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+1
-0
libs/libcommon/CMakeLists.txt
libs/libcommon/CMakeLists.txt
+3
-0
libs/libcommon/include/port/clock.h
libs/libcommon/include/port/clock.h
+23
-21
libs/libmysqlxx/CMakeLists.txt
libs/libmysqlxx/CMakeLists.txt
+4
-1
未找到文件。
dbms/CMakeLists.txt
浏览文件 @
7be750af
...
...
@@ -144,6 +144,7 @@ target_link_libraries (clickhouse_common_io
${
EXECINFO_LIBRARY
}
${
ELF_LIBRARY
}
${
Boost_SYSTEM_LIBRARY
}
apple_rt
${
CMAKE_DL_LIBS
}
)
...
...
libs/libcommon/CMakeLists.txt
浏览文件 @
7be750af
...
...
@@ -6,6 +6,9 @@ add_library (apple_rt
include/port/clock.h
)
target_include_directories
(
apple_rt PUBLIC
${
COMMON_INCLUDE_DIR
}
)
if
(
DEFINED APPLE_HAVE_CLOCK_GETTIME
)
target_compile_definitions
(
apple_rt PUBLIC -DAPPLE_HAVE_CLOCK_GETTIME=
${
APPLE_HAVE_CLOCK_GETTIME
}
)
endif
()
add_library
(
common
${
SPLIT_SHARED
}
src/DateLUT.cpp
...
...
libs/libcommon/include/port/clock.h
浏览文件 @
7be750af
...
...
@@ -10,13 +10,15 @@
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#ifndef MAC_OS_X_VERSION_10_12
#define MAC_OS_X_VERSION_10_12 101200
#endif
#define APPLE_HAVE_CLOCK_GETTIME MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
#if !APPLE_HAVE_CLOCK_GETTIME || !defined(CLOCK_MONOTONIC)
# if !defined(APPLE_HAVE_CLOCK_GETTIME)
# include <AvailabilityMacros.h>
# if !defined(MAC_OS_X_VERSION_10_12)
# define MAC_OS_X_VERSION_10_12 101200
# endif
# define APPLE_HAVE_CLOCK_GETTIME MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
# endif
# if !APPLE_HAVE_CLOCK_GETTIME || !defined(CLOCK_MONOTONIC)
/**
* MacOS X doesn't support different clock sources
*
...
...
@@ -24,24 +26,24 @@
* CLOCK_THREAD_CPUTIME_ID, because there is a way
* to implement it using in-kernel stats about threads
*/
#if !defined(CLOCK_MONOTONIC)
#define CLOCK_MONOTONIC 0
#endif
#if !defined(CLOCK_REALTIME)
#define CLOCK_REALTIME CLOCK_MONOTONIC
#endif
#if !defined(CLOCK_THREAD_CPUTIME_ID)
#define CLOCK_THREAD_CPUTIME_ID 3
#endif
#
if !defined(CLOCK_MONOTONIC)
#
define CLOCK_MONOTONIC 0
#
endif
#
if !defined(CLOCK_REALTIME)
#
define CLOCK_REALTIME CLOCK_MONOTONIC
#
endif
#
if !defined(CLOCK_THREAD_CPUTIME_ID)
#
define CLOCK_THREAD_CPUTIME_ID 3
#
endif
typedef
int
clockid_t
;
int
clock_gettime
(
int
clk_id
,
struct
timespec
*
t
);
#else
#
else
#endif
#
endif
#if !defined(CLOCK_MONOTONIC_COARSE)
#define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
#endif
#
if !defined(CLOCK_MONOTONIC_COARSE)
#
define CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC
#
endif
#endif
libs/libmysqlxx/CMakeLists.txt
浏览文件 @
7be750af
...
...
@@ -35,7 +35,10 @@ if (USE_MYSQL)
target_include_directories
(
mysqlxx SYSTEM PRIVATE
${
MYSQL_INCLUDE_DIR
}
)
endif
()
if
(
USE_STATIC_LIBRARIES AND STATIC_MYSQLCLIENT_LIB
)
if
(
APPLE
)
find_library
(
ICONV_LIBRARY iconv
)
set
(
MYSQLCLIENT_LIBRARIES
${
STATIC_MYSQLCLIENT_LIB
}
${
ICONV_LIBRARY
}
)
elseif
(
USE_STATIC_LIBRARIES AND STATIC_MYSQLCLIENT_LIB
)
set
(
MYSQLCLIENT_LIB
${
CMAKE_CURRENT_BINARY_DIR
}
/libmysqlclient.a
)
add_custom_command
(
OUTPUT
${
MYSQLCLIENT_LIB
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录