diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-20 09:08:20 -0400 |
| commit | 72e7269da376d660385f3c66ac2a25a5e50871ea (patch) | |
| tree | 047bd9d1bf99fa8c308c379dd57758050aa5ef51 /indra/integration_tests/llimage_libtest | |
| parent | 621085d553cccc4238d74886ca44bcefafddd7f1 (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
merge changes for 3.5.2-release
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
| -rwxr-xr-x[-rw-r--r--] | indra/integration_tests/llimage_libtest/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/integration_tests/llimage_libtest/llimage_libtest.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/integration_tests/llimage_libtest/llimage_libtest.h | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index af5c9fb2e7..36a7d38bb7 100644..100755 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -16,6 +16,9 @@ include_directories( ${LLVFS_INCLUDE_DIRS} ${LLIMAGE_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ) set(llimage_libtest_SOURCE_FILES llimage_libtest.cpp diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp index 034c816742..034c816742 100644..100755 --- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp +++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.h b/indra/integration_tests/llimage_libtest/llimage_libtest.h index 63f3d46b50..63f3d46b50 100644..100755 --- a/indra/integration_tests/llimage_libtest/llimage_libtest.h +++ b/indra/integration_tests/llimage_libtest/llimage_libtest.h |