1 files changed, 44 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index aa8810f00b..1e3f8bec5d 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -8,9 +8,12 @@ include(bugsplat)
 include(Linking)
 include(Boost)
 include(LLSharedLibs)
+if (USE_AUTOBUILD_3P OR USE_CONAN)
 include(Copy3rdPartyLibs)
+endif ()
 include(ZLIBNG)
 include(Tracy)
+include(Lualibs)
 
 
 set(llcommon_SOURCE_FILES
@@ -193,6 +196,7 @@ set(llcommon_HEADER_FILES
     llliveappconfig.h
     lllivefile.h
     llmainthreadtask.h
+    llmake.h
     llmd5.h
     llmemory.h
     llmemorystream.h
@@ -294,12 +298,52 @@ target_link_libraries(
         ll::boost
         ll::oslibraries
         ll::tracy
+        ll::lualibs
     )
 
 target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(llcommon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
+  if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/sse2neon_installed OR NOT ${sse2neon_installed} EQUAL 0)
+    file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/sse2neon)
+    if (NOT EXISTS ${LIBS_PREBUILT_DIR}/include/sse2neon/sse2neon.h)
+      file(DOWNLOAD
+        https://raw.githubusercontent.com/DLTcollab/sse2neon/master/sse2neon.h
+        ${LIBS_PREBUILT_DIR}/include/sse2neon/sse2neon.h
+        )
+    endif (NOT EXISTS ${LIBS_PREBUILT_DIR}/include/sse2neon/sse2neon.h)
+    file(WRITE ${PREBUILD_TRACKING_DIR}/sse2neon_installed "0")
+  endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/sse2neon_installed OR NOT ${sse2neon_installed} EQUAL 0)
+  target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include/sse2neon)
+endif ()
+
+if (USE_AUTOBUILD_3P OR USE_CONAN)
 add_dependencies(llcommon stage_third_party_libs)
+else ()
+    target_compile_options(${PROJECT_NAME} PUBLIC -Wno-deprecated-declarations)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set_source_files_properties(
+            llapp.cpp
+            llsdutil.cpp
+            PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation)
+        set_source_files_properties(
+            llevent.cpp
+            llfasttimer.cpp
+            PROPERTIES COMPILE_FLAGS -Wno-nonnull)
+        set_source_files_properties(
+            llsdserialize.cpp
+            llsingleton.cpp
+            llstreamtools.cpp
+            lluri.cpp
+            PROPERTIES COMPILE_FLAGS -Wno-restrict)
+    elseif (LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        set_source_files_properties(llsys.cpp PROPERTIES
+            COMPILE_FLAGS -Wno-unused-but-set-variable)
+    endif()
+endif ()
+
+include(LibraryInstall)
 
 if (LL_TESTS)
   include(LLAddBuildTest)