1 files changed, 16 insertions, 0 deletions
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index cc75c463bc..f55d9fdf5e 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -8,9 +8,13 @@ include(LLImage)
 include(JPEG)
 include(LLKDU)
 include(ZLIBNG)
+if (LL_TESTS)
 include(LLAddBuildTest)
+endif ()
 include(bugsplat)
+if (LL_TESTS)
 include(Tut)
+endif ()
 
 set(llimage_SOURCE_FILES
     llimagebmp.cpp
@@ -63,6 +67,18 @@ target_link_libraries(llimage
         ll::libjpeg
     )
 
+if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
+	if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+		set_source_files_properties(llimageworker.cpp PROPERTIES COMPILE_FLAGS -Wno-int-in-bool-context)
+		set_source_files_properties(
+			llimage.cpp
+			llimagefilter.cpp
+			PROPERTIES COMPILE_FLAGS -Wno-stringop-overflow)
+	endif()
+endif ()
+
+include(LibraryInstall)
+
 # Add tests
 if (LL_TESTS)
   SET(llimage_TEST_SOURCE_FILES