diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:46:29 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:46:29 -0400 |
| commit | ac62e322ce0060758afca2007469dd25a3d64d48 (patch) | |
| tree | c86f24d832bb5c5006c5dc95a28e59d1dbdc4c1f /indra/CMakeLists.txt | |
| parent | ee4cd594623eff6f04cfc2bafb937f0cfd631080 (diff) | |
| parent | bff5a4e7940d40576f52105ab9877f5a6b7d85c8 (diff) | |
Merge. Refresh from viewer-drano-http-4 after 3.7.15 release.
Diffstat (limited to 'indra/CMakeLists.txt')
| -rwxr-xr-x | indra/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 410d25ad97..24ea59ca49 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -71,7 +71,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) if (LINUX) add_subdirectory(${VIEWER_PREFIX}linux_crash_logger) - add_subdirectory(${VIEWER_PREFIX}linux_updater) if (INSTALL_PROPRIETARY) include(LLAppearanceUtility) add_subdirectory(${LLAPPEARANCEUTILITY_SRC_DIR} ${LLAPPEARANCEUTILITY_BIN_DIR}) @@ -86,9 +85,8 @@ elseif (WINDOWS) if (EXISTS ${VIEWER_DIR}win_setup) add_subdirectory(${VIEWER_DIR}win_setup) endif (EXISTS ${VIEWER_DIR}win_setup) - add_subdirectory(${VIEWER_PREFIX}win_updater) - # add_dependencies(viewer windows-updater windows-setup windows-crash-logger) - add_dependencies(viewer windows-updater windows-crash-logger) + # add_dependencies(viewer windows-setup windows-crash-logger) + add_dependencies(viewer windows-crash-logger) elseif (SOLARIS) add_subdirectory(solaris_crash_logger) add_dependencies(viewer solaris-crash-logger) |