archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for cmake for recent mingw png lib move.

Browse Source
This commit is contained in:
Thomas Dinges
2011-12-18 23:32:24 +00:00
parent 8f0e9c7c09
commit 9d3e755b4c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -649,10 +649,6 @@ elseif(WIN32)
set(ICONV_LIBPATH ${ICONV}/lib) set(ICONV_LIBPATH ${ICONV}/lib)
endif() 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 "${LIBDIR}/jpeg")
set(JPEG_INCLUDE_DIR "${JPEG}/include") set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -733,6 +729,10 @@ elseif(WIN32)
set(PNG_LIBRARIES libpng_st) set(PNG_LIBRARIES libpng_st)
endif() endif()
set(JPEG_LIBRARIES libjpeg) 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) set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
if(CMAKE_CL_64) if(CMAKE_CL_64)
@@ -913,6 +913,10 @@ elseif(WIN32)
set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES intl) set(GETTEXT_LIBRARIES intl)
endif() 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(JPEG_LIBRARIES libjpeg)
set(PNG_LIBRARIES png) set(PNG_LIBRARIES png)