diff --git a/ANNOUNCE b/ANNOUNCE index 02b9f23be..0ed70b83f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.4rc03 - September 14, 2010 +Libpng 1.4.4rc03 - September 15, 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. @@ -84,6 +84,9 @@ version 1.4.4rc03 [September 14, 2010] Removed an extraneous close-double-quote from CMakeLists.txt Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c +version 1.4.4rc04 [September 15, 2010] + Fixed indentation and removed debugging message 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 2ff389628..c096172f1 100644 --- a/CHANGES +++ b/CHANGES @@ -2668,6 +2668,9 @@ version 1.4.4rc03 [September 14, 2010] Removed an extraneous close-double-quote from CMakeLists.txt Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c +version 1.4.4rc04 [September 15, 2010] + Fixed indentation and removed debugging message 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 ebcc78ced..4e1fa6804 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,17 +232,13 @@ 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 ${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) @@ -278,8 +274,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) @@ -304,13 +300,13 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) ${PNG_EXPORT_RULE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT WIN32 OR CYGWIN) + 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}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() + endif() endif() endif()