From df05762114bae02d18fe14bbfbb5ca45222104f8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 29 Mar 2011 16:54:52 -0700
Subject: [PATCH] STORM-987: Make building of llimage_libtest optional so that
builf failure on Linux doesn't block autobuild merge
---
indra/integration_tests/CMakeLists.txt | 4 +++-
indra/integration_tests/llimage_libtest/CMakeLists.txt | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt
index 5935f23fe9f..248583d775c 100644
--- a/indra/integration_tests/CMakeLists.txt
+++ b/indra/integration_tests/CMakeLists.txt
@@ -1,4 +1,6 @@
# -*- cmake -*-
add_subdirectory(llui_libtest)
-add_subdirectory(llimage_libtest)
+if (LLIMAGE_LIBTEST)
+ add_subdirectory(llimage_libtest)
+endif (LLIMAGE_LIBTEST)
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index f59440be6bf..cab05460835 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -53,9 +53,9 @@ if (DARWIN)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
set(OS_LIBRARIES ${COREFOUNDATION_LIBRARY})
elseif (WINDOWS)
-# set(OS_LIBRARIES)
+ set(OS_LIBRARIES)
elseif (LINUX)
-# set(OS_LIBRARIES)
+ set(OS_LIBRARIES)
else (DARWIN)
message(FATAL_ERROR "Unknown platform")
endif (DARWIN)
--
GitLab