diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-08 12:18:46 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-08 12:18:46 -0500 |
| commit | 601cbe1f60b94ae8105329b4e4f745b36721e5aa (patch) | |
| tree | 480aeda2dcd9a42156057fed3974bf8fbabae9f0 /indra | |
| parent | a4eb5056a717feaf940f125756c7521b9103d41a (diff) | |
SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Linking.cmake | 1 | ||||
| -rw-r--r-- | indra/llvfs/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/win_crash_logger/CMakeLists.txt | 1 |
4 files changed, 1 insertions, 5 deletions
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 |