[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42717] trunk/blender/CMakeLists.txt: Fix for cmake for recent mingw png lib move.
Thomas Dinges
blender at dingto.org
Mon Dec 19 00:32:34 CET 2011
Revision: 42717
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42717
Author: dingto
Date: 2011-12-18 23:32:24 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Fix for cmake for recent mingw png lib move.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-12-18 23:23:09 UTC (rev 42716)
+++ trunk/blender/CMakeLists.txt 2011-12-18 23:32:24 UTC (rev 42717)
@@ -649,10 +649,6 @@
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 @@
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 @@
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)
More information about the Bf-blender-cvs
mailing list