From 1e97f1e8470bcbaf2fc14a05b1bb06377bf20ec3 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 19 Jan 2014 00:51:20 -0700 Subject: [PATCH] Corrected ZLIB name case and moved iconv package to the win32 check --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b50157b..edec2760 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,16 +11,16 @@ set(SWG_EXTERNALS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external) set(SWG_GAME_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/game) find_package(Boost REQUIRED) -find_package(Iconv REQUIRED) find_package(JNI REQUIRED) find_package(LibXml2 REQUIRED) find_package(Oracle REQUIRED) find_package(PCRE REQUIRED) find_package(Perl REQUIRED) find_package(STLPort REQUIRED) -find_package(ZLib REQUIRED) +find_package(ZLIB REQUIRED) if(WIN32) + find_package(Iconv REQUIRED) add_definitions(/D_CRT_SECURE_NO_WARNINGS /wd4244 /wd4996 /wd4018 /wd4351) endif()