diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 | 
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 | 
| commit | a4543cf3cd41a466599de61f02e6d3b3d09700c4 (patch) | |
| tree | 6743beff840669800d4bdc445919bd8f09a06cd5 /indra/llmessage | |
| parent | 52d973e95567efcb145ed0de1f4b6f0e19663776 (diff) | |
| parent | 0797257992ee7f88456d3083ebf214485b75c139 (diff) | |
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 16 | 
1 files changed, 16 insertions, 0 deletions
| diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 4786956e85..d5db3d8b1b 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -3,13 +3,19 @@  project(llmessage)  include(00-Common) +if (LL_TESTS)  include(GoogleMock)  include(LLAddBuildTest) +endif ()  include(LLCommon)  include(LLCoreHttp) +if (LL_TESTS)  include(LLAddBuildTest) +endif ()  include(Python) +if (LL_TESTS)  include(Tut) +endif ()  include(Python)  include(JsonCpp) @@ -130,6 +136,7 @@ set(llmessage_HEADER_FILES      llmessagebuilder.h      llmessageconfig.h      llmessagereader.h +    llmessagesenderinterface.h      llmessagetemplate.h      llmessagetemplateparser.h      llmessagethrottle.h @@ -197,6 +204,15 @@ target_link_libraries(  )  target_include_directories( llmessage  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR}) +if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) +	if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +		set_source_files_properties(llnamevalue.cpp PROPERTIES +			COMPILE_FLAGS -Wno-stringop-truncation) +	endif() +endif () + +include(LibraryInstall) +  # tests  if (LL_TESTS)    SET(llmessage_TEST_SOURCE_FILES | 
