From c1d59f02609def47507c76d65c60f220c508a71f Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Thu, 2 Jul 2009 14:40:05 -0400
Subject: Windows now links to shared apr when LLCOMMON_LINK_SHARED is on.

---
 indra/cmake/APR.cmake | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 0755aeee03..efd47f756a 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -13,18 +13,33 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
-    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
-      )
-    set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
-      )
+    if (LLCOMMON_LINK_SHARED)
+      set(APR_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
+        )
+      set(APRICONV_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
+        )
+      set(APRUTIL_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+        )
+    else (LLCOMMON_LINK_SHARED)
+      set(APR_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
+        )
+      set(APRICONV_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
+        )
+      set(APRUTIL_LIBRARIES 
+        debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
+        )
+    endif (LLCOMMON_LINK_SHARED)
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
-- 
cgit v1.2.3