From a88951185154d8ce988779fdc3e419850dd9b52a Mon Sep 17 00:00:00 2001
From: Kyle Ambroff <ambroff@lindenlab.com>
Date: Fri, 5 Dec 2008 23:07:19 +0000
Subject: Don't link the simulator with iconv.dll on Windows.

---
 indra/cmake/APR.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 2acf07141b..2563a98c52 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -23,10 +23,8 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
       )
-    set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/iconv.dll
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/iconv.dll
-      )
+    # Doesn't need to link with iconv.dll
+    set(APRICONV_LIBRARIES "")
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
-- 
cgit v1.2.3