3 files changed, 47 insertions, 2 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index c1c3ec3..49ea94b 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -66,6 +66,7 @@ Aleric Inglewood
         RED-565
         RED-566
         RED-567
+        RED-573
 Alissa Sabre
         VWR-81
         VWR-83
diff --git a/linden/indra/cmake/FindTut.cmake b/linden/indra/cmake/FindTut.cmake
new file mode 100644
index 0000000..5ac7ec0
--- /dev/null
+++ b/linden/indra/cmake/FindTut.cmake
@@ -0,0 +1,33 @@
+# -*- cmake -*-
+
+# - Find Tut
+# Find the Tut unit test framework includes and library
+# This module defines
+#  TUT_INCLUDE_DIR, where to find tut/tut.hpp, etc.
+#  TUT_FOUND, If false, do not try to use Tut.
+
+find_path(TUT_INCLUDE_DIR tut/tut.hpp
+  NO_SYSTEM_ENVIRONMENT_PATH
+)
+
+IF (TUT_INCLUDE_DIR)
+    SET(TUT_FOUND "YES")
+ELSE (TUT_INCLUDE_DIR)
+  SET(TUT_FOUND "NO")
+ENDIF (TUT_INCLUDE_DIR)
+
+IF (TUT_FOUND)
+   IF (NOT TUT_FIND_QUIETLY)
+      MESSAGE(STATUS "Found Tut: ${TUT_INCLUDE_DIR}")
+        SET(TUT_FIND_QUIETLY TRUE) # Only alert us the first time
+   ENDIF (NOT TUT_FIND_QUIETLY)
+ELSE (TUT_FOUND)
+   IF (TUT_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find Tut")
+   ENDIF (TUT_FIND_REQUIRED)
+ENDIF (TUT_FOUND)
+
+MARK_AS_ADVANCED(
+    TUT_INCLUDE_DIR
+)
+
diff --git a/linden/indra/cmake/Tut.cmake b/linden/indra/cmake/Tut.cmake
index 7488e9d..118c72e 100644
--- a/linden/indra/cmake/Tut.cmake
+++ b/linden/indra/cmake/Tut.cmake
@@ -1,6 +1,17 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (NOT STANDALONE)
+SET(TUT_FIND_REQUIRED FALSE)
+SET(TUT_FIND_QUIETLY TRUE)
+
+if (STANDALONE)
+  if (LL_TESTS)
+    SET(TUT_FIND_REQUIRED TRUE)
+  endif (LL_TESTS)
+  include(FindTut)
+  if (TUT_FOUND)
+    include_directories(${TUT_INCLUDE_DIR})
+  endif (TUT_FOUND)
+else (STANDALONE)
   use_prebuilt_binary(tut)
-endif(NOT STANDALONE)
+endif(STANDALONE)