diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-21 14:19:52 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-21 14:19:52 -0600 |
| commit | 932d7ac5e9802a1619ac27317162634caf077975 (patch) | |
| tree | b110eb7a648c0dcccf4d0377ed0b988e8929ef5f | |
| parent | f9accb9df23b1c0bced6c7e74c8fbcc79f29138d (diff) | |
| download | libpng-932d7ac5e9802a1619ac27317162634caf077975.tar.gz | |
[libpng15]
Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case).
Removed empty vstudio/pngstest directory (Clifford Yapp).
| -rw-r--r-- | ANNOUNCE | 6 | ||||
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ -Libpng 1.5.10beta01 - February 19, 2012 +Libpng 1.5.10beta01 - February 21, 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. @@ -26,8 +26,10 @@ Other information: Changes since the last public release (1.5.9): -Version 1.5.10beta01 [February 19, 2012] +Version 1.5.10beta01 [February 21, 2012] Removed two useless #ifdef directives from pngread.c and one from pngrutil.c + Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case). + Removed empty vstudio/pngstest directory (Clifford Yapp). Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit @@ -3810,8 +3810,10 @@ Version 1.5.9rc01 [February 17, 2012] Version 1.5.9 [February 18, 2012] No changes. -Version 1.5.10beta01 [February 19, 2012] +Version 1.5.10beta01 [February 21, 2012] Removed two useless #ifdef directives from pngread.c and one from pngrutil.c + Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case). + Removed empty vstudio/pngstest directory (Clifford Yapp). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 9775707a3..c1b1d988a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,11 +176,7 @@ endif() # Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - IF(WIN32) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "bin") - ELSE(WIN32) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") - ENDIF(WIN32) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) # Set a variable with CMake code which: |