summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-06 22:43:38 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-06 22:43:38 +0000
commitad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch)
tree1608b2db5d620d323673607ea7ddadfba9d58bda /indra/cmake
parenta7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff)
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/APR.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index c495b7f7c6..eb1fb68991 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -20,16 +20,16 @@ else (STANDALONE)
${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
)
set(APR_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1
+ debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apr-1.lib
+ optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apr-1.lib
)
set(APRUTIL_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1
+ debug ${WINLIBS_PREBUILT_DEBUG_DIR}/aprutil-1.lib
+ optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/aprutil-1.lib
)
set(APRICONV_LIBRARIES
- debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1
- optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1
+ debug ${WINLIBS_PREBUILT_DEBUG_DIR}/apriconv-1.lib
+ optimized ${WINLIBS_PREBUILT_RELEASE_DIR}/apriconv-1.lib
)
elseif (DARWIN)
set(APR_LIBRARIES