diff -r 0d2b3d8256a9 indra/cmake/CURL.cmake
--- a/indra/cmake/CURL.cmake Mon Dec 20 09:57:39 2010 -0800
+++ b/indra/cmake/CURL.cmake Mon Dec 20 22:24:58 2010 -0800
@@ -10,10 +10,10 @@
use_prebuilt_binary(curl)
if (WINDOWS)
set(CURL_LIBRARIES
- debug libcurld
- optimized libcurl)
+ debug libcurld.lib
+ optimized libcurl.lib)
else (WINDOWS)
- set(CURL_LIBRARIES curl)
+ set(CURL_LIBRARIES libcurl.a)
endif (WINDOWS)
set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
endif (STANDALONE)
diff -r 0d2b3d8256a9 indra/mac_updater/CMakeLists.txt
--- a/indra/mac_updater/CMakeLists.txt Mon Dec 20 09:57:39 2010 -0800
+++ b/indra/mac_updater/CMakeLists.txt Mon Dec 20 22:24:58 2010 -0800
@@ -3,6 +3,7 @@
project(mac_updater)
include(00-Common)
+include(OpenSSL)
include(CURL)
include(LLCommon)
include(LLVFS)
@@ -49,6 +50,8 @@
target_link_libraries(mac-updater
${LLVFS_LIBRARIES}
+ ${OPENSSL_LIBRARIES}
+ ${CRYPTO_LIBRARIES}
${CURL_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
diff -r 0d2b3d8256a9 install.xml
--- a/install.xml Mon Dec 20 09:57:39 2010 -0800
+++ b/install.xml Mon Dec 20 22:24:58 2010 -0800
@@ -233,16 +233,16 @@
darwin
linux
linux64