Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party CJSON
提交
76e5296d
T
Third Party CJSON
项目概览
OpenHarmony
/
Third Party CJSON
大约 1 年 前同步成功
通知
6
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party CJSON
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
76e5296d
编写于
3月 16, 2017
作者:
M
Max Bruckner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CMake: Fix per target disabling of compiler flags
The compiler flag detection was working incorrectly.
上级
c597601c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
13 addition
and
10 deletion
+13
-10
CMakeLists.txt
CMakeLists.txt
+9
-6
tests/CMakeLists.txt
tests/CMakeLists.txt
+4
-4
未找到文件。
CMakeLists.txt
浏览文件 @
76e5296d
set
(
CMAKE_LEGACY_CYGWIN_WIN32 0
)
cmake_minimum_required
(
VERSION 2.8
)
subdirs
(
tests fuzzing
)
include
(
GNUInstallDirs
)
project
(
cJSON C
)
...
...
@@ -78,10 +76,13 @@ foreach(compiler_flag ${custom_compiler_flags})
CHECK_C_COMPILER_FLAG
(
${
compiler_flag
}
"FLAG_SUPPORTED_
${
current_variable
}
"
)
if
(
FLAG_SUPPORTED_
${
current_variable
}
)
list
(
APPEND supported_compiler_flags
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
compiler_flag
}
"
)
endif
()
endforeach
()
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
supported_compiler_flags
}
"
)
#variables for pkg-config
set
(
prefix
"
${
CMAKE_INSTALL_PREFIX
}
"
)
set
(
libdir
"
${
CMAKE_INSTALL_LIBDIR
}
"
)
...
...
@@ -168,9 +169,9 @@ if(ENABLE_CJSON_TEST)
target_link_libraries
(
"
${
TEST_CJSON
}
"
"
${
CJSON_LIB
}
"
)
add_test
(
NAME
${
TEST_CJSON
}
COMMAND
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TEST_CJSON
}
"
)
# Disable -fsanitize=float-divide-by-zero for cJSON_test
list
(
FIND custom_compiler_flags
"-fsanitize=float-divide-by-zero"
float_divide_by_zero_found
)
if
(
float_divide_by_zero_found
)
if
(
FLAG_SUPPORTED_fsanitizefloatdividebyzero
)
target_compile_options
(
${
TEST_CJSON
}
PRIVATE
"-fno-sanitize=float-divide-by-zero"
)
endif
()
...
...
@@ -185,6 +186,8 @@ if(ENABLE_CJSON_TEST)
#"check" target that automatically builds everything and runs the tests
add_custom_target
(
check
COMMAND
${
CMAKE_CTEST_COMMAND
}
--output-on-failure
DEPENDS
${
unity_tests
}
${
TEST_CJSON
}
${
TEST_CJSON_UTILS
}
)
DEPENDS
${
TEST_CJSON
}
${
TEST_CJSON_UTILS
}
)
endif
()
add_subdirectory
(
tests
)
add_subdirectory
(
fuzzing
)
tests/CMakeLists.txt
浏览文件 @
76e5296d
...
...
@@ -2,13 +2,11 @@ if(ENABLE_CJSON_TEST)
add_library
(
unity unity/src/unity.c
)
# Disable -Werror for Unity
list
(
FIND custom_compiler_flags
"-Werror"
werror_found
)
if
(
werror_found
)
if
(
FLAG_SUPPORTED_Werror
)
target_compile_options
(
unity PRIVATE
"-Wno-error"
)
endif
()
# Disable -fvisibility=hidden for Unity
list
(
FIND custom_compiler_flags
"-fvisibility=hidden"
visibility_found
)
if
(
visibility_found
)
if
(
FLAG_SUPPORTED_fvisibilityhidden
)
target_compile_options
(
unity PRIVATE
"-fvisibility=default"
)
endif
()
...
...
@@ -57,4 +55,6 @@ if(ENABLE_CJSON_TEST)
COMMAND
"./
${
unity_test
}
"
)
endif
()
endforeach
()
add_dependencies
(
check
${
unity_tests
}
)
endif
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录