diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-30 12:54:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-30 12:54:26 -0400 |
| commit | d1ec5eb22bf92e1d9f45a0a4fc615412814f597f (patch) | |
| tree | 0555fd88c2d67bfcf82116f06e09b59b962b4a24 /indra/integration_tests | |
| parent | 83cff21cfee5ca4fc13fc300e8dfb154ab6c3421 (diff) | |
| parent | df05762114bae02d18fe14bbfbb5ca45222104f8 (diff) | |
pull viewer-development updates and fix for llimage_libtest building
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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 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) diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index f59440be6b..cab0546083 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) |