From b5ef0bb6c235d3a50766fddf02c2850a54480173 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Mar 2009 22:28:49 +0000
Subject: [PATCH] Clean up use of tut
---
indra/CMakeLists.txt | 7 +++----
indra/cmake/CMakeLists.txt | 1 +
indra/cmake/LLAddBuildTest.cmake | 1 +
indra/cmake/Tut.cmake | 6 ++++++
indra/llmessage/CMakeLists.txt | 1 +
indra/test/CMakeLists.txt | 1 +
6 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 indra/cmake/Tut.cmake
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 153cc4d9aac..d19811586ff 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -7,11 +7,10 @@
# The "cmake -E touch" command was released with 2.4.8.
cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR)
-# This makes cmake 2.6 not complain about a version
-# 2.4 compatibility mode
-if(COMMAND cmake_policy)
+# This makes cmake 2.6 not complain about version 2.4 compatibility.
+if (COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD)
-endif(COMMAND cmake_policy)
+endif (COMMAND cmake_policy)
set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
"The root project/makefile/solution name. Defaults to SecondLife.")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 34b8046a17b..9ddcc62f2c1 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -71,6 +71,7 @@ set(cmake_SOURCE_FILES
Prebuilt.cmake
QuickTime.cmake
TemplateCheck.cmake
+ Tut.cmake
UI.cmake
UnixInstall.cmake
Variables.cmake
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 57797a0d122..5d308186427 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -1,3 +1,4 @@
+# -*- cmake -*-
INCLUDE(APR)
INCLUDE(LLMath)
diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake
new file mode 100644
index 00000000000..7488e9dcb0b
--- /dev/null
+++ b/indra/cmake/Tut.cmake
@@ -0,0 +1,6 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+ use_prebuilt_binary(tut)
+endif(NOT STANDALONE)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 4fb01874123..0f3e159802d 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -8,6 +8,7 @@ include(LLMath)
include(LLMessage)
include(LLVFS)
include(LLAddBuildTest)
+include(Tut)
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index b9e0e3dbdde..c8682c8ea74 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -12,6 +12,7 @@ include(LLVFS)
include(LLXML)
include(LScript)
include(Linking)
+include(Tut)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
--
GitLab