diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-20 04:54:40 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-20 04:54:40 +0400 |
| commit | 147bcc92b618701c4906ff99b09da07a5b13a9a4 (patch) | |
| tree | 49a3d63ae6bbe0930ca74526a0e68f0d6c5451a2 /CMakeLists.txt | |
| parent | 858dbbe232cce6a8e1d13a98385122ff236b146e (diff) | |
* Library path fixes for win64
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 00d2244511f..9db25115099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |