* Library path fixes for win64
authorMatt Ebb <matt@mke3.net>
Thu, 20 Aug 2009 00:54:40 +0000 (00:54 +0000)
committerMatt Ebb <matt@mke3.net>
Thu, 20 Aug 2009 00:54:40 +0000 (00:54 +0000)
CMakeLists.txt

index 00d2244511fdd992e8c39fd6b8c9d11c47b08848..9db25115099993ab0eee212e4fa3b7914e62404f 100644 (file)
@@ -256,7 +256,11 @@ IF(WIN32)
 
   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 @@ IF(WIN32)
   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)