diff options
author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-03 10:03:02 -0800 |
---|---|---|
committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-03 10:03:02 -0800 |
commit | c703b2c038c369807218f61b7e90e7134da390f5 (patch) | |
tree | 2123b41de557e0526b5841f8a512408fc8eeb7d9 /indra/cmake | |
parent | fed164732bbd69b22fc0219133bf4cef3deb5f2b (diff) | |
parent | f0a79147210c4ef402dce10a0a3c796807298033 (diff) |
Automated merge with head of lindenlab/nat_viewer64
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index db8b95dbe2..96d3e39a06 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -35,7 +35,6 @@ INCLUDE(GoogleMock) ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} llcommon - llcorehttp ) IF(NOT "${project}" STREQUAL "llmath") # add llmath as a dep unless the tested module *is* llmath! |