From b98469bd7db06973e6058118551e500dc094d3c0 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 18 Dec 2015 13:53:03 -0800 Subject: Disable unit test on Linux only --- indra/cmake/Boost.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/cmake/Boost.cmake') diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 25e54b7cbd..d239e1f3b0 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -123,3 +123,8 @@ else (USESYSTEMLIBS) debug boost_thread-mt-d) endif (WINDOWS) endif (USESYSTEMLIBS) + +if (LINUX) + set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) +endif (LINUX) + -- cgit v1.2.3 From 7900e2ee77c4ebe2bf1f74eb5a8944573a10713e Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 18 Dec 2015 15:06:24 -0800 Subject: Another rt link for linux --- indra/cmake/Boost.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/Boost.cmake') diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index d239e1f3b0..88af9a1513 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -126,5 +126,6 @@ endif (USESYSTEMLIBS) if (LINUX) set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) + set(BOOST_SYSTEM_LIBRARY ${BOOST_THREAD_LIBRARY} rt) endif (LINUX) -- cgit v1.2.3 From 3edc3c5554965b947a8086c9f4f95a28b3a7aaa8 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 21 Dec 2015 14:26:41 -0800 Subject: CMake fixes for Linux build --- indra/cmake/Boost.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake/Boost.cmake') diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 88af9a1513..180a84dbcf 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -126,6 +126,6 @@ endif (USESYSTEMLIBS) if (LINUX) set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) - set(BOOST_SYSTEM_LIBRARY ${BOOST_THREAD_LIBRARY} rt) + set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt) endif (LINUX) -- cgit v1.2.3