diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
| commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
| tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/viewer_components | |
| parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
merge up to 3.5.2 development
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/login/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/viewer_components/updater/CMakeLists.txt | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt index 7720619df3..658f167c2e 100644 --- a/indra/viewer_components/login/CMakeLists.txt +++ b/indra/viewer_components/login/CMakeLists.txt @@ -15,6 +15,10 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ${LLXML_SYSTEM_INCLUDE_DIRS} + ) set(login_SOURCE_FILES lllogin.cpp diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt index c5c78728e7..61fd4220e0 100644 --- a/indra/viewer_components/updater/CMakeLists.txt +++ b/indra/viewer_components/updater/CMakeLists.txt @@ -21,6 +21,9 @@ include_directories( ${CURL_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/newview ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ) set(updater_service_SOURCE_FILES llupdaterservice.cpp |