Reenable and correct link issue on linux llappearanceutility.

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)

indra/cmake/LLAppearanceUtility.cmake

 # -*- 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)
 
 

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}
     )