From 601cbe1f60b94ae8105329b4e4f745b36721e5aa Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 8 Dec 2018 12:18:46 -0500
Subject: SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need.
---
indra/cmake/Linking.cmake | 1 +
indra/llvfs/CMakeLists.txt | 3 ---
indra/newview/CMakeLists.txt | 1 -
indra/win_crash_logger/CMakeLists.txt | 1 -
4 files changed, 1 insertion(+), 5 deletions(-)
(limited to 'indra')
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 74fe3f1137..3cb235a9d5 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -66,6 +66,7 @@ if (WINDOWS)
wldap32
gdi32
user32
+ ole32
dbghelp
)
else (WINDOWS)
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index 8578f7a6bd..67dce8c073 100644
--- 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}")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f10b54d73c..99f99834f3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1585,7 +1585,6 @@ if (WINDOWS)
kernel32
odbc32
odbccp32
- ole32
oleaut32
shell32
Vfw32
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 144d037a31..4fba26ab2f 100644
--- 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
--
cgit v1.2.3