livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding policy fixes

master
Rider Linden 2015-06-17 13:53:28 -07:00
parent a68aa5bfee
commit 4a4470af32
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/linux_crash_logger/CMakeLists.txt
View File

@ -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

4
indra/llcommon/CMakeLists.txt
View File

@ -87,7 +87,7 @@ set(llcommon_SOURCE_FILES
llrefcount.cpp
llrun.cpp
llsd.cpp
llsdjson.cpp
llsdjson.cpp
llsdparam.cpp
llsdserialize.cpp
llsdserialize_xml.cpp
@ -196,7 +196,7 @@ set(llcommon_HEADER_FILES
llrefcount.h
llsafehandle.h
llsd.h
llsdjson.h
llsdjson.h
llsdparam.h
llsdserialize.h
llsdserialize_xml.h

2
indra/llcrashlogger/CMakeLists.txt
View File

@ -11,7 +11,7 @@ include(LLVFS)
include(LLXML)
include_directories(
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}

4
indra/llmessage/CMakeLists.txt
View File

@ -50,7 +50,7 @@ set(llmessage_SOURCE_FILES
llhttpclient.cpp
llhttpconstants.cpp
llhttpnode.cpp
llhttpsdhandler.cpp
llhttpsdhandler.cpp
llhttpsender.cpp
llinstantmessage.cpp
lliobuffer.cpp
@ -144,7 +144,7 @@ set(llmessage_HEADER_FILES
llhttpconstants.h
llhttpnode.h
llhttpnodeadapter.h
llhttpsdhandler.h
llhttpsdhandler.h
llhttpsender.h
llinstantmessage.h
llinvite.h

2
indra/llmessage/llhttpsdhandler.h
View File

@ -69,4 +69,4 @@ protected:
private:
std::string mName;
};
#endif
#endif

8
indra/mac_crash_logger/CMakeLists.txt
View File

@ -15,7 +15,7 @@ include(LLSharedLibs)
include(Boost)
include_directories(
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCRASHLOGGER_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
@ -74,10 +74,10 @@ target_link_libraries(mac-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}
)
add_custom_command(

8
indra/newview/CMakeLists.txt
View File

@ -2311,11 +2311,11 @@ if (LL_TESTS)
${GOOGLEMOCK_LIBRARIES}
)
if (LINUX)
if (LINUX)
# llcommon uses `clock_gettime' which is provided by librt on linux.
set(LIBRT_LIBRARY
rt
)
rt
)
endif (LINUX)
set(test_libs
@ -2328,7 +2328,7 @@ if (LL_TESTS)
${GOOGLEMOCK_LIBRARIES}
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${LIBRT_LIBRARY}
${LIBRT_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_COROUTINE_LIBRARY}
)

2
indra/newview/llfloatermodeluploadbase.cpp
View File

@ -90,4 +90,4 @@ void LLFloaterModelUploadBase::requestAgentUploadPermissionsCoro(LLCoros::self&
result.erase(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS);
observer->onPermissionsReceived(result);
}
}

4
indra/viewer_components/updater/CMakeLists.txt
View File

@ -16,7 +16,7 @@ include(LLVFS)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLMESSAGE_INCLUDE_DIRS}
${LLPLUGIN_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS}
@ -61,7 +61,7 @@ add_library(llupdaterservice
target_link_libraries(llupdaterservice
${LLCOMMON_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLPLUGIN_LIBRARIES}
${LLVFS_LIBRARIES}

4
indra/win_crash_logger/CMakeLists.txt
View File

@ -17,7 +17,7 @@ include(GoogleBreakpad)
include(Boost)
include_directories(
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOREHTTP_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCRASHLOGGER_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
@ -80,7 +80,7 @@ target_link_libraries(windows-crash-logger
${LLXML_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLCOREHTTP_LIBRARIES}
${LLCOMMON_LIBRARIES}
${BOOST_CONTEXT_LIBRARY}
${BOOST_COROUTINE_LIBRARY}