summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2011-03-19 22:43:33 +0100
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2011-03-19 22:43:33 +0100
commitabc259618f06f69ba8e7c72cb149bcddc1bb6ddf (patch)
tree210057ba1e2e1d9a9b14073a828b8cfc628118ea
parent5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (diff)
parent6ec5177667cb63acff03347e3eb9c6a503822de9 (diff)
merged OPEN-39: include Tut.cmake for integration tests (fixes "bitpack_test.o: No such file or directory" on standalone)
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/cmake/LLAddBuildTest.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index d6c0bc3ad5..f4accb364c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -194,6 +194,7 @@ blino Nakamura
VWR-17
Boroondas Gupte
OPEN-29
+ OPEN-39
SNOW-278
SNOW-503
SNOW-510
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index cd0eada2d0..3f259f6382 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -1,6 +1,7 @@
# -*- cmake -*-
include(LLTestCommand)
include(GoogleMock)
+include(Tut)
MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
# Given a project name and a list of sourcefiles (with optional properties on each),