diff options
| author | callum_linden <none@none> | 2018-01-03 13:57:07 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-03 13:57:07 -0800 |
| commit | 3fbe1bd0c2ec9d23763175c79b8ae74f25c040a4 (patch) | |
| tree | 8f963ace1db62a77f91d22e30a6219fc5aea95be /indra/test | |
| parent | b2bbd91669690c22ded28a5890153bb780b7dc62 (diff) | |
| parent | 2af6a857c42bd4d8f20d4fbad1bef5edaa27348f (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 3f12431acc..8344cead57 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -73,9 +73,6 @@ 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} @@ -99,7 +96,6 @@ target_link_libraries(lltest ${GOOGLEMOCK_LIBRARIES} ${PTHREAD_LIBRARY} ${WINDOWS_LIBRARIES} - ${EXTRA_WINDOWS_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} ${BOOST_COROUTINE_LIBRARY} |