diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-21 15:27:41 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-21 15:27:41 -0800 |
| commit | 472c9363a4d3d78aba579aab903101d43b05726a (patch) | |
| tree | d14c7e2d600cfb1e25ca68d2ed596571755944e6 /indra | |
| parent | 91021bf905286bcb5ce0f14e19a55b4800a9ce99 (diff) | |
| parent | aa56f78dd2abd354fc36854d365dbc89459051ff (diff) | |
STORM-453 : pull in viewer-development
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} ) |