From 37922d49b167ba282312d58628e59a60f07b01be Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 17 May 2011 09:32:59 +0200 Subject: also link with ld.gold thanks to Aleric and Siana for the idea --- linden/indra/cmake/LLWindow.cmake | 3 +++ linden/indra/llcommon/CMakeLists.txt | 10 +++++++++- linden/indra/llmessage/CMakeLists.txt | 10 +++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake index 1023693..345359a 100644 --- a/linden/indra/cmake/LLWindow.cmake +++ b/linden/indra/cmake/LLWindow.cmake @@ -45,4 +45,7 @@ else (SERVER AND LINUX) comdlg32 ) endif (WINDOWS) + if (LINUX) + list(APPEND LLWINDOW_LIBRARIES fontconfig) + endif (LINUX) endif (SERVER AND LINUX) diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt index 3f14be6..0a50852 100644 --- a/linden/indra/llcommon/CMakeLists.txt +++ b/linden/indra/llcommon/CMakeLists.txt @@ -189,10 +189,18 @@ set_source_files_properties(${llcommon_HEADER_FILES} list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES}) -target_link_libraries( +set (llcommon_link_LIBRARIES llcommon ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ) + +if (LINUX) + list(APPEND llcommon_link_LIBRARIES rt) +endif (LINUX) + +target_link_libraries( + ${llcommon_link_LIBRARIES} + ) diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt index 0f3e159..88233b9 100644 --- a/linden/indra/llmessage/CMakeLists.txt +++ b/linden/indra/llmessage/CMakeLists.txt @@ -201,13 +201,21 @@ set_source_files_properties(${llmessage_HEADER_FILES} list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES}) add_library (llmessage ${llmessage_SOURCE_FILES}) -target_link_libraries( +set (llmessage_link_LIBRARIES llmessage ${CURL_LIBRARIES} ${CARES_LIBRARIES} ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES} ${XMLRPCEPI_LIBRARIES} +) +if (LINUX) + list(APPEND llmessage_link_LIBRARIES pthread) +endif (LINUX) + +target_link_libraries( + ${llmessage_link_LIBRARIES} + ) IF (NOT LINUX AND VIEWER) -- cgit v1.1