[master] Removed an extraneous close-double-quote from CMakeLists.txt

This commit is contained in:
Glenn Randers-Pehrson 2010-09-13 09:57:13 -05:00
parent 8bc0719dde
commit bcfc0ce5f6
3 changed files with 41 additions and 37 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.4rc02 - September 13, 2010 Libpng 1.4.4rc03 - September 13, 2010
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.4.4rc02.tar.xz (LZMA-compressed, recommended) 1.4.4rc03.tar.xz (LZMA-compressed, recommended)
1.4.4rc02.tar.gz 1.4.4rc03.tar.gz
1.4.4rc02.tar.bz2 1.4.4rc03.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp144r02.zip lp144r03.zip
lp144r02.7z lp144r03.7z
Other information: Other information:
1.4.4rc02-README.txt 1.4.4rc03-README.txt
1.4.4rc02-LICENSE.txt 1.4.4rc03-LICENSE.txt
Changes since the last public release (1.4.3): Changes since the last public release (1.4.3):
@ -80,6 +80,9 @@ version 1.4.4rc01 [September 10, 2010]
version 1.4.4rc02 [September 13, 2010] version 1.4.4rc02 [September 13, 2010]
Revised CMakeLists.txt (Philip Lowman). Revised CMakeLists.txt (Philip Lowman).
version 1.4.4rc03 [September 13, 2010]
Removed an extraneous close-double-quote from CMakeLists.txt
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement). https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

View File

@ -2664,6 +2664,9 @@ version 1.4.4rc01 [September 10, 2010]
version 1.4.4rc02 [September 13, 2010] version 1.4.4rc02 [September 13, 2010]
Revised CMakeLists.txt (Philip Lowman). Revised CMakeLists.txt (Philip Lowman).
version 1.4.4rc03 [September 13, 2010]
Removed an extraneous close-double-quote from CMakeLists.txt
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement). https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

View File

@ -216,8 +216,7 @@ macro(_png_generate_symlink_code CODE SRC DEST)
set(${CODE} " set(${CODE} "
message(STATUS \"${_png_gsc_message}\") message(STATUS \"${_png_gsc_message}\")
execute_process(COMMAND \${CMAKE_COMMAND} -E ${_png_gsc_operation} execute_process(COMMAND \${CMAKE_COMMAND} -E ${_png_gsc_operation}
\"${SRC}\" \"${SRC}\" \"${DEST}\")
\"${DEST}\")
") ")
endmacro() endmacro()
@ -233,23 +232,22 @@ set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set(LIBS "-lz -lm") set(LIBS "-lz -lm")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
_png_generate_symlink_code(PNG_PC_INSTALL_CODE ${PNGLIB_NAME}.pc libpng.pc) _png_generate_symlink_code(PNG_PC_INSTALL_CODE ${PNGLIB_NAME}.pc libpng.pc)
install(CODE ${PNG_PC_INSTALL_CODE}) install(CODE ${PNG_PC_INSTALL_CODE})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
_png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE ${PNGLIB_NAME}-config libpng-config) _png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE ${PNGLIB_NAME}-config libpng-config)
install(CODE ${PNG_CONFIG_INSTALL_CODE}) install(CODE ${PNG_CONFIG_INSTALL_CODE})
MESSAGE(STATUS \"Symlinking ${PNGLIB_NAME}-config to libpng-config\") MESSAGE(STATUS \"Symlinking ${PNGLIB_NAME}-config to libpng-config\")
execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink
\"${PNGLIB_NAME}-config\" \"${PNGLIB_NAME}-config\"
\"libpng-config\") \"libpng-config\")
")
# SET UP LINKS # SET UP LINKS
if(PNG_SHARED) if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 14.${PNGLIB_RELEASE}.1.4.4rc02 # VERSION 14.${PNGLIB_RELEASE}.1.4.4rc03
VERSION 14.${PNGLIB_RELEASE}.0 VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14 SOVERSION 14
CLEAN_DIRECT_OUTPUT 1) CLEAN_DIRECT_OUTPUT 1)