From cda7a0f8cf03b7a99e077043daa2d99ac16ace81 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 9 Feb 2011 23:32:46 -0800 Subject: STORM-987 : Create initial files for llimage_libtest (doesn't build) --- indra/integration_tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/integration_tests/CMakeLists.txt') diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index 67e8fbf1f2..5935f23fe9 100644 --- a/indra/integration_tests/CMakeLists.txt +++ b/indra/integration_tests/CMakeLists.txt @@ -1,3 +1,4 @@ # -*- cmake -*- add_subdirectory(llui_libtest) +add_subdirectory(llimage_libtest) -- cgit v1.2.3 From df05762114bae02d18fe14bbfbb5ca45222104f8 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 29 Mar 2011 16:54:52 -0700 Subject: 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 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/integration_tests/CMakeLists.txt') diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index 5935f23fe9..248583d775 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) -- cgit v1.2.3 From 7b47c0a6f6f74bd42382f37102446742f91bd34a Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 30 Mar 2011 13:22:41 -0700 Subject: STORM-987 : cmake fixes so that llimage_libtest builds correctly on Mac with autobuild --- indra/integration_tests/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/integration_tests/CMakeLists.txt') diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index 248583d775..dcd2079631 100644 --- a/indra/integration_tests/CMakeLists.txt +++ b/indra/integration_tests/CMakeLists.txt @@ -1,6 +1,9 @@ # -*- cmake -*- add_subdirectory(llui_libtest) -if (LLIMAGE_LIBTEST) +IF (LLIMAGE_LIBTEST) + MESSAGE(STATUS "Build llimage_libtest") add_subdirectory(llimage_libtest) -endif (LLIMAGE_LIBTEST) +ELSE (LLIMAGE_LIBTEST) + MESSAGE(STATUS "Skip llimage_libtest") +ENDIF (LLIMAGE_LIBTEST) -- cgit v1.2.3 From 48be3c6af841231f705d88598672588e68e2977e Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 30 Mar 2011 14:47:35 -0700 Subject: STORM-1121 : Simplify dependencies for llimage_libtest --- indra/integration_tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/integration_tests/CMakeLists.txt') diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index dcd2079631..63a053479b 100644 --- a/indra/integration_tests/CMakeLists.txt +++ b/indra/integration_tests/CMakeLists.txt @@ -1,4 +1,6 @@ # -*- cmake -*- +# For STORM-1121 debug. Will delete when ready +SET (LLIMAGE_LIBTEST ON CACHE BOOL "Force build of llimage_libtest for testing") add_subdirectory(llui_libtest) IF (LLIMAGE_LIBTEST) -- cgit v1.2.3 From 61056a68cd1952ee062a5ae3207b9670a31e4c55 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 30 Mar 2011 19:43:35 -0700 Subject: STORM-1121 : Suppress the debug cmake instruction --- indra/integration_tests/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/integration_tests/CMakeLists.txt') diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index 63a053479b..ced2b3dbcf 100644 --- a/indra/integration_tests/CMakeLists.txt +++ b/indra/integration_tests/CMakeLists.txt @@ -1,7 +1,4 @@ # -*- cmake -*- -# For STORM-1121 debug. Will delete when ready -SET (LLIMAGE_LIBTEST ON CACHE BOOL "Force build of llimage_libtest for testing") - add_subdirectory(llui_libtest) IF (LLIMAGE_LIBTEST) MESSAGE(STATUS "Build llimage_libtest") -- cgit v1.2.3