From 62317167b94cfcd23395d0461d4a557121ca50cd Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 15:27:09 -0700 Subject: Shot in the dark --- indra/cmake/LLAppearanceUtility.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/cmake/LLAppearanceUtility.cmake') diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake index 709b91c134..9bf8d21725 100644 --- a/indra/cmake/LLAppearanceUtility.cmake +++ b/indra/cmake/LLAppearanceUtility.cmake @@ -1,5 +1,6 @@ # -*- cmake -*- include(Prebuilt) +include(Boost) # Linux proprietary build only if (INSTALL_PROPRIETARY) @@ -7,6 +8,14 @@ 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) -- cgit v1.2.3 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/LLAppearanceUtility.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/cmake/LLAppearanceUtility.cmake') diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake index 9bf8d21725..306e6e6602 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) -- cgit v1.2.3 From 48d75444ef00c5c770a5b67b14729710a8fc7668 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 16:24:41 -0700 Subject: Try commenting out the entire darn file. --- indra/cmake/LLAppearanceUtility.cmake | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'indra/cmake/LLAppearanceUtility.cmake') diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake index 306e6e6602..4573e85d31 100644 --- a/indra/cmake/LLAppearanceUtility.cmake +++ b/indra/cmake/LLAppearanceUtility.cmake @@ -1,13 +1,14 @@ # -*- cmake -*- -include(Prebuilt) -include(Boost) +#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) -# 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) -- cgit v1.2.3 From 7e1efcd47423e66e3262dff137c793d9ef690a1b Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 25 Aug 2015 16:41:25 -0700 Subject: Reenable and correct link issue on linux llappearanceutility. --- indra/cmake/LLAppearanceUtility.cmake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/cmake/LLAppearanceUtility.cmake') 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) -- cgit v1.2.3