diff --git a/ANNOUNCE b/ANNOUNCE index 9c2bc46be..30de78fa4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 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 "configure" script - 1.4.4rc02.tar.xz (LZMA-compressed, recommended) - 1.4.4rc02.tar.gz - 1.4.4rc02.tar.bz2 + 1.4.4rc03.tar.xz (LZMA-compressed, recommended) + 1.4.4rc03.tar.gz + 1.4.4rc03.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp144r02.zip - lp144r02.7z + lp144r03.zip + lp144r03.7z Other information: - 1.4.4rc02-README.txt - 1.4.4rc02-LICENSE.txt + 1.4.4rc03-README.txt + 1.4.4rc03-LICENSE.txt 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] 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 or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index b2eebfaf7..ba20418d3 100644 --- a/CHANGES +++ b/CHANGES @@ -2664,6 +2664,9 @@ version 1.4.4rc01 [September 10, 2010] version 1.4.4rc02 [September 13, 2010] 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 or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f9ea6f1..4a79368f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE) # workaround CMake 2.4.x bug set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") else() - set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug @@ -207,18 +207,17 @@ endif() 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") + set(_png_gsc_operation "copy_if_different") else() set(_png_gsc_message "Symlinking ${SRC} to ${DEST}") - set(_png_gsc_operation "create_symlink") + set(_png_gsc_operation "create_symlink") endif() - - set(${CODE} " + + set(${CODE} " message(STATUS \"${_png_gsc_message}\") execute_process(COMMAND \${CMAKE_COMMAND} -E ${_png_gsc_operation} - \"${SRC}\" - \"${DEST}\") - ") + \"${SRC}\" \"${DEST}\") + ") endmacro() # CREATE PKGCONFIG FILES @@ -230,26 +229,25 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_LIBDIR}) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(LIBS "-lz -lm") +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 ${PNGLIB_NAME}.pc libpng.pc) -install(CODE ${PNG_PC_INSTALL_CODE}) + _png_generate_symlink_code(PNG_PC_INSTALL_CODE ${PNGLIB_NAME}.pc libpng.pc) + install(CODE ${PNG_PC_INSTALL_CODE}) 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 ${PNGLIB_NAME}-config libpng-config) + _png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE ${PNGLIB_NAME}-config libpng-config) install(CODE ${PNG_CONFIG_INSTALL_CODE}) MESSAGE(STATUS \"Symlinking ${PNGLIB_NAME}-config to libpng-config\") execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink \"${PNGLIB_NAME}-config\" \"libpng-config\") -") # SET UP LINKS if(PNG_SHARED) 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 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -280,8 +278,8 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) install(TARGETS ${PNG_LIB_NAME} ${PNG_EXPORT_RULE} RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # Create a symlink for libpng.dll.a => libpng14.dll.a on Cygwin if(CYGWIN) @@ -294,25 +292,25 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) if(NOT WIN32) _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}) + ${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() + endif() endif() if(PNG_STATIC) install(TARGETS ${PNG_LIB_NAME_STATIC} ${PNG_EXPORT_RULE} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT WIN32 OR CYGWIN) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(NOT WIN32 OR CYGWIN) _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}) + ${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() + endif() endif() endif() @@ -334,11 +332,11 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) # Install pkg-config files install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin) endif()