Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion

2019-09-28 19:03:49 -04:00
parent 0880c762c9
commit 8561af1f84
29 changed files with 136 additions and 21 deletions
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -58,8 +58,14 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})

 add_library (llplugin ${llplugin_SOURCE_FILES})
 if(LINUX AND STANDALONE)
-    target_link_libraries (llplugin rt dl)
-endif(LINUX AND STANDALONE)
+    target_link_libraries (llplugin llcommon rt dl)
+else()
+    target_link_libraries(
+        llplugin
+        PUBLIC
+        llcommon
+        )
+endif()

 add_subdirectory(slplugin)

--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(SLPlugin)

 include(00-Common)
+include(Linking)
 include(LLCommon)
 include(LLPlugin)
 include(Linking)