From 870008f15b60399af6971ea746bcf7a05a8ea1db Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 14 Dec 2017 19:33:10 -0500
Subject: [PATCH] MAINT-8087: New LLDir_Win32 code requires ole32 in a few more
places.
---
indra/test/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 8344cead57c..3f12431accc 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -73,6 +73,9 @@ if (NOT WINDOWS)
list(APPEND test_SOURCE_FILES
llmessagetemplateparser_tut.cpp
)
+ set(EXTRA_WINDOWS_LIBRARIES "")
+else (NOT WINDOWS)
+ set(EXTRA_WINDOWS_LIBRARIES ole32)
endif (NOT WINDOWS)
set_source_files_properties(${test_HEADER_FILES}
@@ -96,6 +99,7 @@ target_link_libraries(lltest
${GOOGLEMOCK_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
+ ${EXTRA_WINDOWS_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
${BOOST_COROUTINE_LIBRARY}
--
GitLab