[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22642] branches/blender2.5/blender/ CMakeLists.txt: * Library path fixes for win64
Matt Ebb
matt at mke3.net
Thu Aug 20 02:54:40 CEST 2009
Revision: 22642
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22642
Author: broken
Date: 2009-08-20 02:54:40 +0200 (Thu, 20 Aug 2009)
Log Message:
-----------
* Library path fixes for win64
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-08-20 00:42:57 UTC (rev 22641)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-08-20 00:54:40 UTC (rev 22642)
@@ -256,7 +256,11 @@
SET(ZLIB ${LIBDIR}/zlib)
SET(ZLIB_INC ${ZLIB}/include)
- SET(ZLIB_LIBRARIES zlib)
+ IF(CMAKE_CL_64)
+ SET(ZLIB_LIBRARIES libz)
+ ELSE(CMAKE_CL_64)
+ SET(ZLIB_LIBRARIES zlib)
+ ENDIF(CMAKE_CL_64)
SET(ZLIB_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads)
@@ -279,7 +283,7 @@
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
IF(CMAKE_CL_64)
- SET(GETTEXT_LIB gettextlib)
+ SET(GETTEXT_LIB gettext)
ELSE(CMAKE_CL_64)
SET(GETTEXT_LIB gnu_gettext)
ENDIF(CMAKE_CL_64)
More information about the Bf-blender-cvs
mailing list