diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-08-25 16:41:25 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-08-25 16:41:25 -0700 |
| commit | 7e1efcd47423e66e3262dff137c793d9ef690a1b (patch) | |
| tree | 8063acbfd18adbe3978c2479d49582361e5e1684 /indra | |
| parent | 96bb17f20bbcdc595f3a615a3129e134595b3a4a (diff) | |
Reenable and correct link issue on linux llappearanceutility.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/cmake/LLAppearanceUtility.cmake | 22 | ||||
| -rwxr-xr-x | indra/llcommon/CMakeLists.txt | 3 |
3 files changed, 18 insertions, 15 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index bd00d9eef8..10692402a5 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -67,10 +67,10 @@ endif (ENABLE_MEDIA_PLUGINS) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) -# if (INSTALL_PROPRIETARY) -# include(LLAppearanceUtility) -# add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR}) -# endif (INSTALL_PROPRIETARY) + if (INSTALL_PROPRIETARY) + include(LLAppearanceUtility) + add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR}) + endif (INSTALL_PROPRIETARY) add_dependencies(viewer linux-crash-logger-strip-target linux-updater) elseif (DARWIN) add_subdirectory(${VIEWER_PREFIX}mac_crash_logger) diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake index 4573e85d31..28b49bf75f 100644 --- a/indra/cmake/LLAppearanceUtility.cmake +++ b/indra/cmake/LLAppearanceUtility.cmake @@ -1,14 +1,14 @@ # -*- cmake -*- -#include(Prebuilt) -#include(Boost) -# -## Linux proprietary build only -#if (INSTALL_PROPRIETARY) -# if(LINUX) -# use_prebuilt_binary(llappearance_utility) -# set(LLAPPEARANCEUTILITY_SRC_DIR ${LIBS_PREBUILT_DIR}/llappearanceutility/src) -# set(LLAPPEARANCEUTILITY_BIN_DIR ${CMAKE_BINARY_DIR}/llappearanceutility) -# endif (LINUX) -#endif (INSTALL_PROPRIETARY) +include(Prebuilt) +include(Boost) + +# Linux proprietary build only +if (INSTALL_PROPRIETARY) + if(LINUX) + use_prebuilt_binary(llappearance_utility) + set(LLAPPEARANCEUTILITY_SRC_DIR ${LIBS_PREBUILT_DIR}/llappearanceutility/src) + set(LLAPPEARANCEUTILITY_BIN_DIR ${CMAKE_BINARY_DIR}/llappearanceutility) + endif (LINUX) +endif (INSTALL_PROPRIETARY) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index d33c3a20c8..e529cea29c 100755 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -267,8 +267,11 @@ target_link_libraries( ${JSONCPP_LIBRARIES} ${ZLIB_LIBRARIES} ${WINDOWS_LIBRARIES} + ${BOOST_COROUTINE_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} + ${BOOST_SYSTEM_LIBRARY} ${GOOGLE_PERFTOOLS_LIBRARIES} ${URIPARSER_LIBRARIES} ) |