SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need.

2018-12-08 12:18:46 -05:00 · 2018-12-08 12:18:46 -05:00 · 601cbe1f60
parent a4eb5056a7
commit 601cbe1f60
4 changed files with 1 additions and 5 deletions
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@ -66,6 +66,7 @@ if (WINDOWS)
      wldap32
      gdi32
      user32
+      ole32
      dbghelp
      )
 else (WINDOWS)
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@ -98,9 +98,6 @@ if (LL_TESTS)

    # INTEGRATION TESTS
    set(test_libs llmath llcommon llvfs ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
-    if (WINDOWS)
-      list(APPEND test_libs ole32)
-    endif (WINDOWS)

    # TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests.
    LL_ADD_INTEGRATION_TEST(lldir "" "${test_libs}")
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@ -1585,7 +1585,6 @@ if (WINDOWS)
        kernel32
        odbc32
        odbccp32
-        ole32
        oleaut32
        shell32
        Vfw32
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@ -89,7 +89,6 @@ target_link_libraries(windows-crash-logger
    ${GOOGLE_PERFTOOLS_LIBRARIES}
    user32
    gdi32
-    ole32
    oleaut32
    wininet
    Wldap32