From f577f7164142769ae9c45e6d734dfbf60ff3ba3c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 13:16:02 -0700 Subject: Missed the linux crash logger. --- indra/linux_crash_logger/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index c0fc1b2be0..3253c79ed3 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -4,6 +4,7 @@ project(linux_crash_logger) include(00-Common) include(GLH) +include(LLCoreHttp) include(LLCommon) include(LLCrashLogger) include(LLMath) @@ -13,8 +14,10 @@ include(LLXML) include(Linking) include(UI) include(FreeType) +include(Boost) include_directories( + ${LLCOREHTTP_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} @@ -60,7 +63,10 @@ target_link_libraries(linux-crash-logger ${LLMESSAGE_LIBRARIES} ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} + ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${BOOST_CONTEXT_LIBRARY} + ${BOOST_COROUTINE_LIBRARY} ${UI_LIBRARIES} ${DB_LIBRARIES} ${FREETYPE_LIBRARIES} -- cgit v1.2.3 From cc26fb5b24c0276e01c66d0eb6c695831809ad69 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 14:06:03 -0700 Subject: Add LIBRT to libraries in linux crash logger. --- indra/linux_crash_logger/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 3253c79ed3..67b3ed109a 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -56,6 +56,14 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES}) +if (LINUX) + # llcommon uses `clock_gettime' which is provided by librt on linux. + set(LIBRT_LIBRARY + rt + ) +endif (LINUX) + + target_link_libraries(linux-crash-logger ${LLCRASHLOGGER_LIBRARIES} ${LLVFS_LIBRARIES} @@ -65,6 +73,7 @@ target_link_libraries(linux-crash-logger ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} + ${LIBRT_LIBRARY} ${BOOST_CONTEXT_LIBRARY} ${BOOST_COROUTINE_LIBRARY} ${UI_LIBRARIES} -- cgit v1.2.3 From 7c639f11a6a4bb0b194d97e9932310561e11df71 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 14:52:20 -0700 Subject: Change link order --- indra/linux_crash_logger/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 67b3ed109a..480a55a709 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -56,12 +56,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES}) -if (LINUX) - # llcommon uses `clock_gettime' which is provided by librt on linux. - set(LIBRT_LIBRARY - rt - ) -endif (LINUX) +# llcommon uses `clock_gettime' which is provided by librt on linux. +set(LIBRT_LIBRARY rt) target_link_libraries(linux-crash-logger @@ -72,8 +68,8 @@ target_link_libraries(linux-crash-logger ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} - ${LLCOMMON_LIBRARIES} ${LIBRT_LIBRARY} + ${LLCOMMON_LIBRARIES} ${BOOST_CONTEXT_LIBRARY} ${BOOST_COROUTINE_LIBRARY} ${UI_LIBRARIES} -- cgit v1.2.3 From ef1b709c99c9fc496bb127be749fababdf9c3bb3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 15:21:49 -0700 Subject: Fix to linux link Put timeout back into crashlogger post. --- indra/linux_crash_logger/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 480a55a709..3db83f9d29 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -61,6 +61,7 @@ set(LIBRT_LIBRARY rt) target_link_libraries(linux-crash-logger + ${LIBRT_LIBRARY} ${LLCRASHLOGGER_LIBRARIES} ${LLVFS_LIBRARIES} ${LLXML_LIBRARIES} @@ -68,7 +69,6 @@ target_link_libraries(linux-crash-logger ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} - ${LIBRT_LIBRARY} ${LLCOMMON_LIBRARIES} ${BOOST_CONTEXT_LIBRARY} ${BOOST_COROUTINE_LIBRARY} -- cgit v1.2.3 From 0b76b318db8bd3233595fb4164fd2e38a3d4553f Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 15:45:04 -0700 Subject: Move librt. --- indra/linux_crash_logger/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 3db83f9d29..44dddd0034 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -61,7 +61,6 @@ set(LIBRT_LIBRARY rt) target_link_libraries(linux-crash-logger - ${LIBRT_LIBRARY} ${LLCRASHLOGGER_LIBRARIES} ${LLVFS_LIBRARIES} ${LLXML_LIBRARIES} @@ -75,6 +74,7 @@ target_link_libraries(linux-crash-logger ${UI_LIBRARIES} ${DB_LIBRARIES} ${FREETYPE_LIBRARIES} + ${LIBRT_LIBRARY} ) add_custom_target(linux-crash-logger-target ALL -- cgit v1.2.3 From 4a4470af3210153e0909eb75d51de461d14a3128 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 17 Jun 2015 13:53:28 -0700 Subject: Coding policy fixes --- indra/linux_crash_logger/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 44dddd0034..81d14c695b 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -17,7 +17,7 @@ include(FreeType) include(Boost) include_directories( - ${LLCOREHTTP_INCLUDE_DIRS} + ${LLCOREHTTP_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLCRASHLOGGER_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} @@ -67,14 +67,14 @@ target_link_libraries(linux-crash-logger ${LLMESSAGE_LIBRARIES} ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} - ${LLCOREHTTP_LIBRARIES} + ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} - ${BOOST_CONTEXT_LIBRARY} - ${BOOST_COROUTINE_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} + ${BOOST_COROUTINE_LIBRARY} ${UI_LIBRARIES} ${DB_LIBRARIES} ${FREETYPE_LIBRARIES} - ${LIBRT_LIBRARY} + ${LIBRT_LIBRARY} ) add_custom_target(linux-crash-logger-target ALL -- cgit v1.2.3 From c4267e0284bb0765470ef2e88000c2b5e0c7c8e7 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 19 Aug 2015 10:30:41 -0700 Subject: Swap BOOST_COROUTINE and BOOST_CONTEXT --- indra/linux_crash_logger/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/linux_crash_logger') diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 81d14c695b..029096df37 100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -69,8 +69,8 @@ target_link_libraries(linux-crash-logger ${LLMATH_LIBRARIES} ${LLCOREHTTP_LIBRARIES} ${LLCOMMON_LIBRARIES} - ${BOOST_CONTEXT_LIBRARY} ${BOOST_COROUTINE_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} ${UI_LIBRARIES} ${DB_LIBRARIES} ${FREETYPE_LIBRARIES} -- cgit v1.2.3