Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
3d615766
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
接近 2 年 前同步成功
通知
1
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
3d615766
编写于
1月 22, 2018
作者:
E
Ebrahim Byagowi
提交者:
GitHub
1月 22, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cmake] fix symbol exporting issue on newer gcc (#724)
上级
8b60e7c2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
11 deletion
+11
-11
CMakeLists.txt
CMakeLists.txt
+11
-11
未找到文件。
CMakeLists.txt
浏览文件 @
3d615766
...
@@ -269,7 +269,7 @@ if (HB_HAVE_FREETYPE)
...
@@ -269,7 +269,7 @@ if (HB_HAVE_FREETYPE)
list
(
APPEND THIRD_PARTY_LIBS
${
FREETYPE_LIBRARIES
}
)
list
(
APPEND THIRD_PARTY_LIBS
${
FREETYPE_LIBRARIES
}
)
include_directories
(
AFTER
${
FREETYPE_INCLUDE_DIRS
}
)
include_directories
(
AFTER
${
FREETYPE_INCLUDE_DIRS
}
)
add_definitions
(
-DHAVE_FREETYPE=1
-DHAVE_FT_FACE_GETCHARVARIANTINDEX=1
)
add_definitions
(
-DHAVE_FREETYPE=1
)
list
(
APPEND project_sources
${
PROJECT_SOURCE_DIR
}
/src/hb-ft.cc
)
list
(
APPEND project_sources
${
PROJECT_SOURCE_DIR
}
/src/hb-ft.cc
)
list
(
APPEND project_headers
${
PROJECT_SOURCE_DIR
}
/src/hb-ft.h
)
list
(
APPEND project_headers
${
PROJECT_SOURCE_DIR
}
/src/hb-ft.h
)
...
@@ -355,7 +355,7 @@ if (APPLE AND HB_HAVE_CORETEXT)
...
@@ -355,7 +355,7 @@ if (APPLE AND HB_HAVE_CORETEXT)
if
(
APPLICATION_SERVICES_FRAMEWORK
)
if
(
APPLICATION_SERVICES_FRAMEWORK
)
list
(
APPEND THIRD_PARTY_LIBS
${
APPLICATION_SERVICES_FRAMEWORK
}
)
list
(
APPEND THIRD_PARTY_LIBS
${
APPLICATION_SERVICES_FRAMEWORK
}
)
endif
(
APPLICATION_SERVICES_FRAMEWORK
)
endif
(
APPLICATION_SERVICES_FRAMEWORK
)
mark_as_advanced
(
APPLICATION_SERVICES_FRAMEWORK
)
mark_as_advanced
(
APPLICATION_SERVICES_FRAMEWORK
)
endif
()
endif
()
...
@@ -380,7 +380,7 @@ endif ()
...
@@ -380,7 +380,7 @@ endif ()
if
(
HB_HAVE_GOBJECT
)
if
(
HB_HAVE_GOBJECT
)
include
(
FindPythonInterp
)
include
(
FindPythonInterp
)
include
(
FindPerl
)
include
(
FindPerl
)
# Use the hints from glib-2.0.pc to find glib-mkenums
# Use the hints from glib-2.0.pc to find glib-mkenums
find_package
(
PkgConfig
)
find_package
(
PkgConfig
)
pkg_check_modules
(
PC_GLIB QUIET glib-2.0
)
pkg_check_modules
(
PC_GLIB QUIET glib-2.0
)
...
@@ -530,7 +530,8 @@ if (UNIX OR MINGW)
...
@@ -530,7 +530,8 @@ if (UNIX OR MINGW)
))
))
set
(
CMAKE_CXX_FLAGS
"-fno-rtti -fno-exceptions
${
CMAKE_CXX_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"-fno-rtti -fno-exceptions
${
CMAKE_CXX_FLAGS
}
"
)
endif
()
endif
()
set
(
CMAKE_CXX_IMPLICIT_LINK_LIBRARIES
""
)
add_definitions
(
-D__CORRECT_ISO_CPP11_MATH_H_PROTO_FP
)
set
(
CMAKE_CXX_IMPLICIT_LINK_LIBRARIES
"c;m"
)
# libc and libm
set
(
CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
""
)
set
(
CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
""
)
set_target_properties
(
harfbuzz PROPERTIES LINKER_LANGUAGE C
)
set_target_properties
(
harfbuzz PROPERTIES LINKER_LANGUAGE C
)
...
@@ -790,7 +791,8 @@ endif ()
...
@@ -790,7 +791,8 @@ endif ()
## Tests
## Tests
if
(
UNIX OR MINGW
)
if
(
UNIX OR MINGW
)
if
(
BUILD_SHARED_LIBS
)
if
(
BUILD_SHARED_LIBS
)
string
(
REPLACE
";"
" "
space_separated_headers
"
${
project_headers
}
"
)
# generate harfbuzz.def after build completion
string
(
REPLACE
";"
" "
space_separated_headers
"
${
project_headers
}
"
)
add_custom_command
(
TARGET harfbuzz POST_BUILD
add_custom_command
(
TARGET harfbuzz POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E env
"headers=
${
space_separated_headers
}
"
python
${
PROJECT_SOURCE_DIR
}
/src/gen-def.py
${
PROJECT_BINARY_DIR
}
/harfbuzz.def
COMMAND
${
CMAKE_COMMAND
}
-E env
"headers=
${
space_separated_headers
}
"
python
${
PROJECT_SOURCE_DIR
}
/src/gen-def.py
${
PROJECT_BINARY_DIR
}
/harfbuzz.def
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/src
)
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/src
)
...
@@ -800,13 +802,11 @@ if (UNIX OR MINGW)
...
@@ -800,13 +802,11 @@ if (UNIX OR MINGW)
WORKING_DIRECTORY
${
PROJECT_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/harfbuzz.dir/src
# ugly hack
WORKING_DIRECTORY
${
PROJECT_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/harfbuzz.dir/src
# ugly hack
)
)
add_test
(
NAME check-libstdc++.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-libstdc++.sh
)
add_test
(
NAME check-libstdc++.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-libstdc++.sh
)
set_tests_properties
(
check-static-inits.sh check-libstdc++.sh PROPERTIES ENVIRONMENT
"libs=.;srcdir=
${
PROJECT_SOURCE_DIR
}
/src"
)
add_test
(
NAME check-symbols.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-symbols.sh
)
add_test
(
NAME check-defs.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-defs.sh
)
if
(
APPLE
)
# doesn't work on Linux it seems
set_tests_properties
(
check-static-inits.sh check-libstdc++.sh check-symbols.sh check-defs.sh
add_test
(
NAME check-symbols.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-symbols.sh
)
PROPERTIES ENVIRONMENT
"libs=.;srcdir=
${
PROJECT_SOURCE_DIR
}
/src"
)
add_test
(
NAME check-defs.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-defs.sh
)
set_tests_properties
(
check-symbols.sh check-defs.sh PROPERTIES ENVIRONMENT
"libs=.;srcdir=
${
PROJECT_SOURCE_DIR
}
/src"
)
endif
()
endif
()
endif
()
add_test
(
NAME check-c-linkage-decls.sh COMMAND ./check-c-linkage-decls.sh
)
add_test
(
NAME check-c-linkage-decls.sh COMMAND ./check-c-linkage-decls.sh
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录