Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party CJSON
提交
f47271f4
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,发现更多精彩内容 >>
提交
f47271f4
编写于
2月 06, 2018
作者:
M
Max Bruckner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix pkgconfig and installation. Thanks @zeerd for reporting
CMAKE_INSTALL_FULL_... needs to be used.
上级
7cc52f60
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
19 addition
and
27 deletion
+19
-27
CMakeLists.txt
CMakeLists.txt
+11
-17
library_config/cJSONConfig.cmake.in
library_config/cJSONConfig.cmake.in
+2
-2
library_config/libcjson.pc.in
library_config/libcjson.pc.in
+3
-4
library_config/libcjson_utils.pc.in
library_config/libcjson_utils.pc.in
+3
-4
未找到文件。
CMakeLists.txt
浏览文件 @
f47271f4
...
...
@@ -107,12 +107,6 @@ 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
}
"
)
set
(
version
"
${
PROJECT_VERSION
}
"
)
set
(
includedir
"
${
CMAKE_INSTALL_INCLUDEDIR
}
"
)
option
(
BUILD_SHARED_LIBS
"Build shared libraries"
ON
)
option
(
ENABLE_TARGET_EXPORT
"Enable exporting of CMake targets. Disable when it causes problems!"
ON
)
...
...
@@ -149,15 +143,15 @@ endif()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/library_config/libcjson.pc.in"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson.pc"
@ONLY
)
install
(
FILES cJSON.h DESTINATION
"
${
CMAKE_INSTALL_INCLUDEDIR
}
/cjson"
)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson.pc"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
install
(
TARGETS
"
${
CJSON_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
EXPORT
"
${
CJSON_LIB
}
"
)
install
(
FILES cJSON.h DESTINATION
"
${
CMAKE_INSTALL_
FULL_
INCLUDEDIR
}
/cjson"
)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson.pc"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
/pkgconfig"
)
install
(
TARGETS
"
${
CJSON_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
"
EXPORT
"
${
CJSON_LIB
}
"
)
if
(
BUILD_SHARED_AND_STATIC_LIBS
)
install
(
TARGETS
"
${
CJSON_LIB
}
-static"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
)
install
(
TARGETS
"
${
CJSON_LIB
}
-static"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
"
)
endif
()
if
(
ENABLE_TARGET_EXPORT
)
# export library information for CMake projects
install
(
EXPORT
"
${
CJSON_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/cJSON"
)
install
(
EXPORT
"
${
CJSON_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
/cmake/cJSON"
)
endif
()
set_target_properties
(
"
${
CJSON_LIB
}
"
...
...
@@ -188,15 +182,15 @@ if(ENABLE_CJSON_UTILS)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/library_config/libcjson_utils.pc.in"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson_utils.pc"
@ONLY
)
install
(
TARGETS
"
${
CJSON_UTILS_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
EXPORT
"
${
CJSON_UTILS_LIB
}
"
)
install
(
TARGETS
"
${
CJSON_UTILS_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
"
EXPORT
"
${
CJSON_UTILS_LIB
}
"
)
if
(
BUILD_SHARED_AND_STATIC_LIBS
)
install
(
TARGETS
"
${
CJSON_UTILS_LIB
}
-static"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
"
)
install
(
TARGETS
"
${
CJSON_UTILS_LIB
}
-static"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
"
)
endif
()
install
(
FILES cJSON_Utils.h DESTINATION
"
${
CMAKE_INSTALL_INCLUDEDIR
}
/cjson"
)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson_utils.pc"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/pkgconfig"
)
install
(
FILES cJSON_Utils.h DESTINATION
"
${
CMAKE_INSTALL_
FULL_
INCLUDEDIR
}
/cjson"
)
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/libcjson_utils.pc"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
/pkgconfig"
)
if
(
ENABLE_TARGET_EXPORT
)
# export library information for CMake projects
install
(
EXPORT
"
${
CJSON_UTILS_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/cJSON"
)
install
(
EXPORT
"
${
CJSON_UTILS_LIB
}
"
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
/cmake/cJSON"
)
endif
()
set_target_properties
(
"
${
CJSON_UTILS_LIB
}
"
...
...
@@ -216,7 +210,7 @@ configure_file(
# Install package config files
install
(
FILES
${
PROJECT_BINARY_DIR
}
/cJSONConfig.cmake
${
PROJECT_BINARY_DIR
}
/cJSONConfigVersion.cmake
DESTINATION
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/cJSON"
)
DESTINATION
"
${
CMAKE_INSTALL_
FULL_
LIBDIR
}
/cmake/cJSON"
)
option
(
ENABLE_CJSON_TEST
"Enable building cJSON test"
ON
)
if
(
ENABLE_CJSON_TEST
)
...
...
library_config/cJSONConfig.cmake.in
浏览文件 @
f47271f4
...
...
@@ -2,8 +2,8 @@
set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
# The include directories used by cJSON
set(CJSON_INCLUDE_DIRS "@
prefix@/@includedir
@")
set(CJSON_INCLUDE_DIR "@
prefix@/@includedir
@")
set(CJSON_INCLUDE_DIRS "@
CMAKE_INSTALL_FULL_INCLUDEDIR
@")
set(CJSON_INCLUDE_DIR "@
CMAKE_INSTALL_FULL_INCLUDEDIR
@")
get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
...
...
library_config/libcjson.pc.in
浏览文件 @
f47271f4
prefix=@prefix@
libdir=${prefix}/@libdir@
includedir=${prefix}/@includedir@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: libcjson
Version: @
version
@
Version: @
PROJECT_VERSION
@
Description: Ultralightweight JSON parser in ANSI C
URL: https://github.com/DaveGamble/cJSON
Libs: -L${libdir} -lcjson
...
...
library_config/libcjson_utils.pc.in
浏览文件 @
f47271f4
prefix=@prefix@
libdir=${prefix}/@libdir@
includedir=${prefix}/@includedir@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: libcjson_utils
Version: @
version
@
Version: @
PROJECT_VERSION
@
Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
URL: https://github.com/DaveGamble/cJSON
Libs: -L${libdir} -lcjson_utils
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录