diff options
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 8 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
3 files changed, 8 insertions, 8 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index f4b251ebc8..410766e4f9 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -12,10 +12,4 @@ set(LLCOMMON_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ) -set(LLCOMMON_LIBRARIES - llcommon - ${APRUTIL_LIBRARIES} - ${APR_LIBRARIES} - ${EXPAT_LIBRARIES} - ${ZLIB_LIBRARIES} - ) +set(LLCOMMON_LIBRARIES llcommon) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 8810549883..4001e1f0c5 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -187,3 +187,10 @@ set_source_files_properties(${llcommon_HEADER_FILES} list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES}) +target_link_libraries( + llcommon + ${APRUTIL_LIBRARIES} + ${APR_LIBRARIES} + ${EXPAT_LIBRARIES} + ${ZLIB_LIBRARIES} + ) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b0663c1d3b..9a01a84de8 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1388,7 +1388,6 @@ target_link_libraries(secondlife-bin ${QUICKTIME_LIBRARY} ${WINDOWS_LIBRARIES} ${XMLRPCEPI_LIBRARIES} - ${ZLIB_LIBRARIES} ${ELFIO_LIBRARIES} ) |