diff --git a/ANNOUNCE b/ANNOUNCE index 5c3686765..fe63a3a68 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.11rc02 - May 23, 2012 +Libpng 1.5.11rc02 - May 29, 2012 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,8 +40,9 @@ Version 1.5.11beta01 [April 28, 2012] Version 1.5.11rc01 [May 23, 2012] No changes. -Version 1.5.11rc02 [May 23, 2012] +Version 1.5.11rc02 [May 29, 2012] Fixed some typos in comments. + Revised CMakeLists.txt to not attempt to make a symlink under mingw. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index ff7e2fd8e..2421ef3d7 100644 --- a/CHANGES +++ b/CHANGES @@ -3868,8 +3868,9 @@ Version 1.5.11beta01 [April 28, 2012] Version 1.5.11rc01 [May 23, 2012] No changes. -Version 1.5.11rc02 [May 23, 2012] +Version 1.5.11rc02 [May 29, 2012] Fixed some typos in comments. + Revised CMakeLists.txt to not attempt to make a symlink under mingw. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index c9faaf2f5..c007656a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,7 @@ ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) # copies if different. macro(CREATE_SYMLINK SRC_FILE DEST_FILE) FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) - if(WIN32 AND NOT CYGWIN AND NOT MINGW) + if(WIN32 AND NOT CYGWIN AND NOT MSYS) 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} @@ -192,10 +192,10 @@ macro(CREATE_SYMLINK SRC_FILE 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 AND NOT MINGW) + else(WIN32 AND NOT CYGWIN AND NOT MSYS) 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 AND NOT MINGW) + endif(WIN32 AND NOT CYGWIN AND NOT MSYS) endmacro() # libpng is a library so default to 'lib'