From 89cb5aa99eaa7a662cd361746a80ecbb0c5ec7ca Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 20 Aug 2010 18:16:23 +0100
Subject: [PATCH] VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in
Standalone builds
---
doc/contributions.txt | 2 ++
indra/cmake/FindTut.cmake | 31 +++++++++++++++++++++++++++++++
indra/cmake/Tut.cmake | 10 ++++++++--
3 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 indra/cmake/FindTut.cmake
diff --git a/doc/contributions.txt b/doc/contributions.txt
index eea73ee767..9df072e937 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -151,6 +151,7 @@ blino Nakamura
Boroondas Gupte
SNOW-278
SNOW-503
+ SNOW-510
SNOW-527
SNOW-624
VWR-233
@@ -533,6 +534,7 @@ Robin Cornelius
VWR-11128
VWR-12533
VWR-12587
+ VWR-12758
VWR-12763
VWR-12995
Ryozu Kojima
diff --git a/indra/cmake/FindTut.cmake b/indra/cmake/FindTut.cmake
new file mode 100644
index 0000000000..b5d58f6396
--- /dev/null
+++ b/indra/cmake/FindTut.cmake
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+
+# - Find Tut
+# Find the Tut unit test framework includes and library
+# This module defines
+# TUT_INCLUDE_DIR, where to find tut.h, etc.
+# TUT_FOUND, If false, do not try to use Tut.
+
+find_path(TUT_INCLUDE_DIR tut.h
+ /usr/local/include/
+ /usr/include
+ )
+
+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/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake
index 7488e9dcb0..784560471d 100644
--- a/indra/cmake/Tut.cmake
+++ b/indra/cmake/Tut.cmake
@@ -1,6 +1,12 @@
# -*- cmake -*-
include(Prebuilt)
-if (NOT STANDALONE)
+set(TUT_FIND_REQUIRED TRUE)
+set(TUT_FIND_QUIETLY TRUE)
+
+if (STANDALONE)
+ include(FindTut)
+ include_directories(${TUT_INCLUDE_DIR})
+else (STANDALONE)
use_prebuilt_binary(tut)
-endif(NOT STANDALONE)
+endif (STANDALONE)
--
GitLab