Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Libpng
提交
b17c75b2
T
Third Party Libpng
项目概览
OpenHarmony
/
Third Party Libpng
大约 1 年 前同步成功
通知
4
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Libpng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
You need to sign in or sign up before continuing.
提交
b17c75b2
编写于
7月 27, 2011
作者:
G
Glenn Randers-Pehrson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[devel] Revised CMakeLists.txt (Clifford Yapp)
上级
d4e1ddb6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
72 deletion
+43
-72
ANNOUNCE
ANNOUNCE
+3
-2
CHANGES
CHANGES
+2
-1
CMakeLists.txt
CMakeLists.txt
+38
-69
未找到文件。
ANNOUNCE
浏览文件 @
b17c75b2
Libpng 1.5.5beta04 - July 2
7
, 2011
Libpng 1.5.5beta04 - July 2
8
, 2011
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
...
...
@@ -40,7 +40,8 @@ Version 1.5.5beta03 [July 27, 2011]
changes to pngrutil.c to cast results where C++ expects it but C does not.
Minor editing of libpng.3 and libpng-manual.txt.
Version 1.5.5beta04 [July 27, 2011]
Version 1.5.5beta04 [July 28, 2011]
Revised CMakeLists.txt (Clifford Yapp)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
...
...
CHANGES
浏览文件 @
b17c75b2
...
...
@@ -3524,7 +3524,8 @@ Version 1.5.5beta03 [July 27, 2011]
changes to pngrutil.c to cast results where C++ expects it but C does not.
Minor editing of libpng.3 and libpng-manual.txt.
Version 1.5.5beta04 [July 27, 2011]
Version 1.5.5beta04 [July 28, 2011]
Revised CMakeLists.txt (Clifford Yapp)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
...
...
CMakeLists.txt
浏览文件 @
b17c75b2
...
...
@@ -217,22 +217,23 @@ endif()
# Set a variable with CMake code which:
# Creates a symlink from src to dest (if possible) or alternatively
# copies if different.
macro
(
_png_generate_symlink_code CODE SRC DEST
)
if
(
WIN32 AND NOT CYGWIN
)
set
(
_png_gsc_message
"Copying
${
SRC
}
to
${
DEST
}
if needed"
)
set
(
_png_gsc_operation
"copy_if_different"
)
else
()
set
(
_png_gsc_message
"Symlinking
${
SRC
}
to
${
DEST
}
"
)
set
(
_png_gsc_operation
"create_symlink"
)
endif
()
set
(
${
CODE
}
"
message(STATUS
\"
${
_png_gsc_message
}
\"
)
execute_process(COMMAND
\$
{CMAKE_COMMAND} -E
${
_png_gsc_operation
}
\"
${
SRC
}
\"
\"
${
DEST
}
\"
)
"
)
macro
(
CREATE_SYMLINK SRC_FILE DEST_FILE
)
FILE
(
REMOVE
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
DEST_FILE
}
)
if
(
WIN32 AND NOT CYGWIN
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
DEST_FILE
}
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
DEST_FILE
}
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
SRC_FILE
}
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
DEST_FILE
}
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
SRC_FILE
}
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
DEST_FILE
}
DEPENDS
${
PNG_LIB_NAME
}
${
PNG_LIB_NAME_STATIC
}
)
ADD_CUSTOM_TARGET
(
${
DEST_FILE
}
_COPY ALL DEPENDS
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
DEST_FILE
}
)
else
(
WIN32 AND NOT CYGWIN
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E create_symlink
${
SRC_FILE
}
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
DEST_FILE
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
-E create_symlink
${
SRC_FILE
}
${
DEST_FILE
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
(
WIN32 AND NOT CYGWIN
)
endmacro
()
# CREATE PKGCONFIG FILES
# we use the same files like ./configure, so we have to set its vars
if
(
NOT DEFINED CMAKE_INSTALL_LIBDIR
)
...
...
@@ -245,17 +246,11 @@ set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set
(
LIBS
"-lz -lm"
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/libpng.pc.in
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PNGLIB_NAME
}
.pc @ONLY
)
_png_generate_symlink_code
(
PNG_PC_INSTALL_CODE
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PNGLIB_NAME
}
.pc
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng.pc
)
install
(
CODE
${
PNG_PC_INSTALL_CODE
}
)
CREATE_SYMLINK
(
${
PNGLIB_NAME
}
.pc libpng.pc
)
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/libpng-config.in
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PNGLIB_NAME
}
-config @ONLY
)
_png_generate_symlink_code
(
PNG_CONFIG_INSTALL_CODE
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
PNGLIB_NAME
}
-config
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng-config
)
install
(
CODE
${
PNG_CONFIG_INSTALL_CODE
}
)
CREATE_SYMLINK
(
${
PNGLIB_NAME
}
-config libpng-config
)
# SET UP LINKS
if
(
PNG_SHARED
)
...
...
@@ -295,36 +290,22 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
# Create a symlink for libpng.dll.a => libpng15.dll.a on Cygwin
if
(
CYGWIN
)
_png_generate_symlink_code
(
PNG_SHARED_IMPLIB_INSTALL_CODE
${
PNGLIB_NAME
}${
CMAKE_IMPORT_LIBRARY_SUFFIX
}
libpng
${
CMAKE_IMPORT_LIBRARY_SUFFIX
}
)
install
(
CODE
${
PNG_SHARED_IMPLIB_INSTALL_CODE
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_IMPORT_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
if
(
CYGWIN
)
get_target_property
(
BUILD_TARGET_LOCATION
${
PNG_LIB_NAME
}
LOCATION_
${
CMAKE_BUILD_TYPE
}
)
get_filename_component
(
BUILD_TARGET_FILE
${
BUILD_TARGET_LOCATION
}
NAME
)
CREATE_SYMLINK
(
${
BUILD_TARGET_FILE
}
libpng
${
CMAKE_IMPORT_LIBRARY_SUFFIX
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_IMPORT_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
(
CYGWIN
)
if
(
NOT WIN32
)
IF
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
)
_png_generate_symlink_code
(
PNG_SHARED_INSTALL_CODE
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
PNGLIB_NAME
}${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
install
(
CODE
${
PNG_SHARED_INSTALL_CODE
}
)
install
(
FILES
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
ELSE
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
)
_png_generate_symlink_code
(
PNG_SHARED_INSTALL_CODE
${
PNGLIB_NAME
}${
CMAKE_SHARED_LIBRARY_SUFFIX
}
libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
install
(
CODE
${
PNG_SHARED_INSTALL_CODE
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
ENDIF
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY
)
endif
()
endif
()
get_target_property
(
BUILD_TARGET_LOCATION
${
PNG_LIB_NAME
}
LOCATION_
${
CMAKE_BUILD_TYPE
}
)
get_filename_component
(
BUILD_TARGET_FILE
${
BUILD_TARGET_LOCATION
}
NAME
)
CREATE_SYMLINK
(
${
BUILD_TARGET_FILE
}
libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
(
NOT WIN32
)
endif
(
PNG_SHARED
)
if
(
PNG_STATIC
)
install
(
TARGETS
${
PNG_LIB_NAME_STATIC
}
...
...
@@ -332,25 +313,13 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
ARCHIVE DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
if
(
NOT WIN32 OR CYGWIN
)
IF
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
)
_png_generate_symlink_code
(
PNG_STATIC_INSTALL_CODE
${
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
}
/
${
PNGLIB_NAME
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
${
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
}
/libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
install
(
CODE
${
PNG_STATIC_INSTALL_CODE
}
)
install
(
FILES
${
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
}
/libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
ELSE
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
)
_png_generate_symlink_code
(
PNG_STATIC_INSTALL_CODE
${
PNGLIB_NAME
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
install
(
CODE
${
PNG_STATIC_INSTALL_CODE
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
ENDIF
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY
)
endif
()
endif
()
get_target_property
(
BUILD_TARGET_LOCATION
${
PNG_LIB_NAME_STATIC
}
LOCATION_
${
CMAKE_BUILD_TYPE
}
)
get_filename_component
(
BUILD_TARGET_FILE
${
BUILD_TARGET_LOCATION
}
NAME
)
CREATE_SYMLINK
(
${
BUILD_TARGET_FILE
}
libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libpng
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
(
NOT WIN32 OR CYGWIN
)
endif
()
endif
()
if
(
NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录