diff options
author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
---|---|---|
committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
commit | 13ec15beb948f0036ea281a5bee25355b5d5478b (patch) | |
tree | b6aa41aca034f1ffb65c619a0da843f8d9d46163 /indra/cmake | |
parent | 8d884c343669d884c2f9eb7485a77fdf9a83ce5d (diff) | |
parent | c703b2c038c369807218f61b7e90e7134da390f5 (diff) |
Automated merge with head of callum_linden/viewer64-callum
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! |