From be7ed4acd4a75915bfc04e65ed385a179d74b646 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 15:38:12 -0700 Subject: Previous try didn't work. What about this? --- indra/cmake/LLAppearance.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/cmake/LLAppearance.cmake') diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake index bd3795a526..6e6d8385d0 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) -- cgit v1.2.3 From 19afd182346354474e2e06a6bc2119096cfe86c3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 16:04:57 -0700 Subject: Try disabling LLAppearanceUtility.cmake just for the moment. --- indra/cmake/LLAppearance.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/cmake/LLAppearance.cmake') diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake index 6e6d8385d0..b51c19fda4 100644 --- a/indra/cmake/LLAppearance.cmake +++ b/indra/cmake/LLAppearance.cmake @@ -7,19 +7,11 @@ 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) -- cgit v1.2.3 From 8adb6997b1ad1289e8832d81a5446dcdadaf5e06 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 16:44:47 -0700 Subject: I must be losing my mind... --- indra/cmake/LLAppearance.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/cmake/LLAppearance.cmake') diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake index b51c19fda4..0ad2c1d4ed 100644 --- a/indra/cmake/LLAppearance.cmake +++ b/indra/cmake/LLAppearance.cmake @@ -15,6 +15,12 @@ if (BUILD_HEADLESS) ) endif (BUILD_HEADLESS) -set(LLAPPEARANCE_LIBRARIES llappearance) +set(LLAPPEARANCE_LIBRARIES llappearance + llmessage + llcorehttp + ${BOOST_COROUTINE_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} + ${BOOST_SYSTEM_LIBRARY}) +) -- cgit v1.2.3 From 7d2ed8e60668a69e97c58072377273e035022cd2 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 20 Aug 2015 08:58:41 -0700 Subject: Remove forgotten paren --- indra/cmake/LLAppearance.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/cmake/LLAppearance.cmake') diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake index 0ad2c1d4ed..ae265d07e3 100644 --- a/indra/cmake/LLAppearance.cmake +++ b/indra/cmake/LLAppearance.cmake @@ -20,7 +20,8 @@ set(LLAPPEARANCE_LIBRARIES llappearance llcorehttp ${BOOST_COROUTINE_LIBRARY} ${BOOST_CONTEXT_LIBRARY} - ${BOOST_SYSTEM_LIBRARY}) -) + ${BOOST_SYSTEM_LIBRARY} + ) + -- cgit v1.2.3