From be7ed4acd4a75915bfc04e65ed385a179d74b646 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 19 Aug 2015 15:38:12 -0700
Subject: [PATCH] Previous try didn't work. What about this?
---
indra/cmake/LLAppearance.cmake | 11 +++++++++++
indra/cmake/LLAppearanceUtility.cmake | 8 --------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake
index bd3795a5262..6e6d8385d0a 100644
--- a/indra/cmake/LLAppearance.cmake
+++ b/indra/cmake/LLAppearance.cmake
@@ -1,14 +1,25 @@
# -*- cmake -*-
include(Variables)
+include(Boost)
+include(LLMessage)
+include(LLCoreHttp)
set(LLAPPEARANCE_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llappearance
+ llcorehttp
+ llmessage
+ ${BOOST_COROUTINE_LIBRARY}
+ ${BOOST_CONTEXT_LIBRARY}
)
if (BUILD_HEADLESS)
set(LLAPPEARANCE_HEADLESS_LIBRARIES
llappearanceheadless
+ llcorehttp
+ llmessage
+ ${BOOST_COROUTINE_LIBRARY}
+ ${BOOST_CONTEXT_LIBRARY}
)
endif (BUILD_HEADLESS)
diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake
index 9bf8d217258..306e6e66024 100644
--- a/indra/cmake/LLAppearanceUtility.cmake
+++ b/indra/cmake/LLAppearanceUtility.cmake
@@ -8,14 +8,6 @@ if (INSTALL_PROPRIETARY)
use_prebuilt_binary(llappearance_utility)
set(LLAPPEARANCEUTILITY_SRC_DIR ${LIBS_PREBUILT_DIR}/llappearanceutility/src)
set(LLAPPEARANCEUTILITY_BIN_DIR ${CMAKE_BINARY_DIR}/llappearanceutility)
- target_link_libraries(appearance-utility-bin
- ${BOOST_COROUTINE_LIBRARY}
- ${BOOST_CONTEXT_LIBRARY}
- ${BOOST_SYSTEM_LIBRARY})
- target_link_libraries(appearance-utility-headless-bin
- ${BOOST_COROUTINE_LIBRARY}
- ${BOOST_CONTEXT_LIBRARY}
- ${BOOST_SYSTEM_LIBRARY})
endif (LINUX)
endif (INSTALL_PROPRIETARY)
--
GitLab