diff options
| author | callum_linden <callum@lindenlab.com> | 2017-12-18 17:14:28 -0800 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-12-18 17:14:28 -0800 |
| commit | b2bbd91669690c22ded28a5890153bb780b7dc62 (patch) | |
| tree | 48a1295cf87c4699f98754d42ca29dd1c2267aa3 /indra/test | |
| parent | 6ced87c0275ec20fca994f8d2f61947d5ac62082 (diff) | |
| parent | 34a9de7270efc4aa45504eb70ec7367cf7162603 (diff) | |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 8344cead57..3f12431acc 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} |