Now there is a oslibrary target get rid of some more obsolete vars:

LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)

9 files changed, 1 insertions, 14 deletions

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index d06ea58549..c4a1ca918f 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -17,10 +17,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include(Variables)
 include(BuildVersion)
 
-set(LEGACY_STDIO_LIBS)
-if (WINDOWS)
-      set(LEGACY_STDIO_LIBS legacy_stdio_definitions)
-endif (WINDOWS)
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9412475640..1f63fed613 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -204,10 +204,8 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     )
 
   SET(libraries
-          ${LEGACY_STDIO_LIBS}
           ${library_dependencies}
           ll::googlemock
-          ${PTHREAD_LIBRARY}
           )
 
   # Add test executable build target
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index ccbb27ca42..4d99026dfc 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -88,7 +88,7 @@ else()
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COREAUDIO_LIBRARY CoreAudio)
-  
+
   set_target_libraries( ll::oslibraries
           ${COCOA_LIBRARY}
           ${IOKIT_LIBRARY}
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index 00da3e7efc..a027860c0b 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -51,7 +51,6 @@ set_target_properties(llimage_libtest
 # Libraries on which this application depends on
 # Sort by high-level to low-level
 target_link_libraries(llimage_libtest
-        ${LEGACY_STDIO_LIBS}
         llcommon
         llfilesystem
         llmath
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index ef6107fe66..51fe35df43 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -60,7 +60,6 @@ add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 target_link_libraries(llui_libtest
-        ${LEGACY_STDIO_LIBS}
         llui
         llinventory
         llmessage
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 0d45814d86..e2bd9ae5b8 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -185,7 +185,6 @@ endif (DARWIN)
       )
 
   set(example_libs
-      ${LEGACY_STDIO_LIBS}
           llcorehttp
           llmessage
           llcommon
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 05e311f7e4..9daf7d327c 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -46,7 +46,6 @@ set_target_properties(SLPlugin
 endif ()
 
 target_link_libraries(SLPlugin
-      ${LEGACY_STDIO_LIBS}
       llplugin
       llmessage
       llcommon
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e039828221..9af6ddcca6 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1937,7 +1937,6 @@ endif (WINDOWS)
 # modern version.
 
 target_link_libraries(${VIEWER_BINARY_NAME}
-        ${LEGACY_STDIO_LIBS}
         llaudio
         llcharacter
         llimage
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 822574210f..23f80d1ef9 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -65,8 +65,6 @@ if (USE_BUGSPLAT)
 endif (USE_BUGSPLAT)
 
 target_link_libraries(lltest
-        ${LEGACY_STDIO_LIBS}
-        ${LLDATABASE_LIBRARIES}
         llinventory
         llmessage
         llmath