diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-30 14:47:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-30 14:47:35 -0700 |
| commit | 48be3c6af841231f705d88598672588e68e2977e (patch) | |
| tree | a7310d846277fc43d5aef527d4d085081c1296e1 /indra | |
| parent | 7b47c0a6f6f74bd42382f37102446742f91bd34a (diff) | |
STORM-1121 : Simplify dependencies for llimage_libtest
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/integration_tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/integration_tests/llimage_libtest/CMakeLists.txt | 6 |
2 files changed, 2 insertions, 6 deletions
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) diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index fdd6770aca..a687e60610 100644 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -6,19 +6,15 @@ project (llimage_libtest) include(00-Common) include(LLCommon) -include(Linking) -include(LLSharedLibs) include(LLImage) include(LLImageJ2COJ) include(LLKDU) -include(LLMath) include(LLVFS) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} - ${LLMATH_INCLUDE_DIRS} ) set(llimage_libtest_SOURCE_FILES @@ -127,5 +123,3 @@ endif (WINDOWS) # *NOTE: This could be removed, or only built by TeamCity, if the build # and link times become too long. add_dependencies(viewer llimage_libtest) - -ll_deploy_sharedlibs_command(llimage_libtest) |