diff options
| author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
| commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
| tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/CMakeLists.txt | |
| parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/CMakeLists.txt')
| -rw-r--r--[-rwxr-xr-x] | indra/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 133c5ee265..1afcb118bc 100755..100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -39,8 +39,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs) add_subdirectory(${LIBS_OPEN_PREFIX}llwindow) add_subdirectory(${LIBS_OPEN_PREFIX}llxml) -add_subdirectory(${LIBS_OPEN_PREFIX}lscript) - if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts) endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) @@ -85,8 +83,11 @@ endif (LINUX) add_subdirectory(${VIEWER_PREFIX}newview) add_dependencies(viewer secondlife-bin) +add_subdirectory(${VIEWER_PREFIX}doxygen EXCLUDE_FROM_ALL) + if (LL_TESTS) # Define after the custom targets are created so # individual apps can add themselves as dependencies add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests) endif (LL_TESTS) + |