diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-12-19 03:32:24 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-12-19 03:32:24 +0400 |
| commit | 9d3e755b4c6bfbb0bd43e0c98abc06994e7ca5df (patch) | |
| tree | fdfe62130950de80755829800cb27cebe9879512 /CMakeLists.txt | |
| parent | 8f0e9c7c09f33e7be22b4062fdb3547994c84b35 (diff) | |
Fix for cmake for recent mingw png lib move.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eaa75ddb1f9..af111c27f4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -649,10 +649,6 @@ elseif(WIN32) set(ICONV_LIBPATH ${ICONV}/lib) endif() - set(PNG "${LIBDIR}/png") - set(PNG_INCLUDE_DIR "${PNG}/include") - set(PNG_LIBPATH ${PNG}/lib) # not cmake defined - set(JPEG "${LIBDIR}/jpeg") set(JPEG_INCLUDE_DIR "${JPEG}/include") set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined @@ -733,6 +729,10 @@ elseif(WIN32) set(PNG_LIBRARIES libpng_st) endif() set(JPEG_LIBRARIES libjpeg) + + set(PNG "${LIBDIR}/png") + set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include) if(CMAKE_CL_64) @@ -913,6 +913,10 @@ elseif(WIN32) set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBRARIES intl) endif() + + set(PNG "${LIBDIR}/gcc/png") + set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(JPEG_LIBRARIES libjpeg) set(PNG_LIBRARIES png) |