aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/APR.cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-13 00:19:34 -0600
committerJacek Antonelli2009-01-13 00:19:34 -0600
commit106b2a600c59404ef6bb95b77f8bbf271b659baa (patch)
tree4f9394f0ca34003347de3dffff40efd8a3a43c6c /linden/indra/cmake/APR.cmake
parentMerge 1.1.0 alpha into quickfilter (diff)
parentMerge commit 'mccabe/1.1.0a-gstreamer' into 1.1.0a (diff)
downloadmeta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.zip
meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.gz
meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.bz2
meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.xz
Merge branch '1.1.0a-gstreamer' into next
Diffstat (limited to 'linden/indra/cmake/APR.cmake')
-rw-r--r--linden/indra/cmake/APR.cmake23
1 files changed, 8 insertions, 15 deletions
diff --git a/linden/indra/cmake/APR.cmake b/linden/indra/cmake/APR.cmake
index 2a96d70..2563a98 100644
--- a/linden/indra/cmake/APR.cmake
+++ b/linden/indra/cmake/APR.cmake
@@ -15,24 +15,16 @@ if (STANDALONE)
15else (STANDALONE) 15else (STANDALONE)
16 use_prebuilt_binary(apr_suite) 16 use_prebuilt_binary(apr_suite)
17 if (WINDOWS) 17 if (WINDOWS)
18 set(WINLIBS_PREBUILT_DEBUG_DIR
19 ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug
20 )
21 set(WINLIBS_PREBUILT_RELEASE_DIR
22 ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
23 )
24 set(APR_LIBRARIES 18 set(APR_LIBRARIES
25 debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib 19 debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
26 optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib 20 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
27 ) 21 )
28 set(APRUTIL_LIBRARIES 22 set(APRUTIL_LIBRARIES
29 debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib 23 debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
30 optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib 24 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
31 )
32 set(APRICONV_LIBRARIES
33 debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
34 optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
35 ) 25 )
26 # Doesn't need to link with iconv.dll
27 set(APRICONV_LIBRARIES "")
36 elseif (DARWIN) 28 elseif (DARWIN)
37 set(APR_LIBRARIES 29 set(APR_LIBRARIES
38 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a 30 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
@@ -42,10 +34,11 @@ else (STANDALONE)
42 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a 34 debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.a
43 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a 35 optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
44 ) 36 )
45 set(APRICONV_LIBRARIES apriconv-1) 37 set(APRICONV_LIBRARIES iconv)
46 else (WINDOWS) 38 else (WINDOWS)
47 set(APR_LIBRARIES apr-1) 39 set(APR_LIBRARIES apr-1)
48 set(APRUTIL_LIBRARIES aprutil-1) 40 set(APRUTIL_LIBRARIES aprutil-1)
41 set(APRICONV_LIBRARIES iconv)
49 endif (WINDOWS) 42 endif (WINDOWS)
50 set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1) 43 set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
51 44