From d7d89645fdacad48905ccd8dbcadba449cbb6a90 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Fri, 18 Mar 2016 15:48:48 +0100 Subject: [PATCH] fixed link target for zlibstatic under Windows --- 3rdParty/zlib/zlib-1.2.8/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt index 0c2c1efd6d..53a66fec5a 100644 --- a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt +++ b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt @@ -69,7 +69,7 @@ endif() check_include_file(unistd.h Z_HAVE_UNISTD_H) if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") + # set(CMAKE_DEBUG_POSTFIX "d") add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -267,12 +267,12 @@ set(ZLIB_VERSION if (WINDOWS) set(ZLIB_LIBS - zlibstaticd + zlibstatic CACHE INTERNAL "${PROJECT_NAME}: Libraries" ) - list(APPEND LINK_DIRECTORIES "${zlib_BINARY_DIR}/${CMAKE_BUILD_TYPE_INIT}") + list(APPEND LINK_DIRECTORIES "${zlib_BINARY_DIR}") else () set(ZLIB_LIBS z