Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed link target for zlibstatic under Windows

This commit is contained in:
Frank Celler 2016-03-18 15:48:48 +01:00
parent 4ed9b382dd
commit d7d89645fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdParty/zlib/zlib-1.2.8/CMakeLists.txt vendored
View File

@ -69,7 +69,7 @@ endif()
check_include_file(unistd.h Z_HAVE_UNISTD_H) check_include_file(unistd.h Z_HAVE_UNISTD_H)
if(MSVC) if(MSVC)
set(CMAKE_DEBUG_POSTFIX "d") # set(CMAKE_DEBUG_POSTFIX "d")
add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@ -267,12 +267,12 @@ set(ZLIB_VERSION
if (WINDOWS) if (WINDOWS)
set(ZLIB_LIBS set(ZLIB_LIBS
zlibstaticd zlibstatic
CACHE INTERNAL CACHE INTERNAL
"${PROJECT_NAME}: Libraries" "${PROJECT_NAME}: Libraries"
) )
list(APPEND LINK_DIRECTORIES "${zlib_BINARY_DIR}/${CMAKE_BUILD_TYPE_INIT}") list(APPEND LINK_DIRECTORIES "${zlib_BINARY_DIR}")
else () else ()
set(ZLIB_LIBS set(ZLIB_LIBS
z z