diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-15 13:36:06 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-15 13:36:06 -0800 |
| commit | aa56f78dd2abd354fc36854d365dbc89459051ff (patch) | |
| tree | ffd8e87d7941c9f254b267f0ed20333c7f981c47 /indra | |
| parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) | |
STORM-453 : Points to the 7.21 curl libs, fixes curl cmake, fixes mac_updater build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/CURL.cmake | 6 | ||||
| -rw-r--r-- | indra/mac_updater/CMakeLists.txt | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 6e5fed4d52..9aba08e573 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -10,10 +10,10 @@ else (STANDALONE) 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 --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt index 44f98e5e18..a4a6b50c6c 100644 --- a/indra/mac_updater/CMakeLists.txt +++ b/indra/mac_updater/CMakeLists.txt @@ -3,6 +3,7 @@ project(mac_updater) include(00-Common) +include(OpenSSL) include(CURL) include(LLCommon) include(LLVFS) @@ -49,6 +50,8 @@ set_target_properties(mac-updater target_link_libraries(mac-updater ${LLVFS_LIBRARIES} + ${OPENSSL_LIBRARIES} + ${CRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${LLCOMMON_LIBRARIES} ) |