Merge vwr-dev-mat

1 files changed, 34 insertions, 34 deletions

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 0a54163644..e06c928eb5 100755
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -64,50 +64,50 @@ if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
 endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
 
 add_custom_target(viewer)
-add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
-add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
-add_subdirectory(${LIBS_OPEN_PREFIX}llui)
-add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llui)
+  add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
 
-# Legacy C++ tests. Build always, run if LL_TESTS is true.
-add_subdirectory(${VIEWER_PREFIX}test)
+  # Legacy C++ tests. Build always, run if LL_TESTS is true.
+  add_subdirectory(${VIEWER_PREFIX}test)
 
-# viewer media plugins
-add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
+  # viewer media plugins
+  add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 
-# llplugin testbed code (is this the right way to include it?)
-if (LL_TESTS AND NOT LINUX)
-  add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
-endif (LL_TESTS AND NOT LINUX)
+  # llplugin testbed code (is this the right way to include it?)
+  if (LL_TESTS AND NOT LINUX)
+    add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
+  endif (LL_TESTS AND NOT LINUX)
 
-if (LINUX)
-  add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
+  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})
   endif (INSTALL_PROPRIETARY)
   add_dependencies(viewer linux-crash-logger-strip-target linux-updater)
-elseif (DARWIN)
-  add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
-  add_subdirectory(${VIEWER_PREFIX}mac_updater)
-  add_dependencies(viewer mac-updater mac-crash-logger)
-elseif (WINDOWS)
-  add_subdirectory(${VIEWER_PREFIX}win_crash_logger)
-  # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
-  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)
-elseif (SOLARIS)
-  add_subdirectory(solaris_crash_logger)
-  add_dependencies(viewer solaris-crash-logger)
-endif (LINUX)
-
-add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer secondlife-bin)
+  elseif (DARWIN)
+    add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
+    add_subdirectory(${VIEWER_PREFIX}mac_updater)
+    add_dependencies(viewer mac-updater mac-crash-logger)
+  elseif (WINDOWS)
+    add_subdirectory(${VIEWER_PREFIX}win_crash_logger)
+    # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
+    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)
+  elseif (SOLARIS)
+    add_subdirectory(solaris_crash_logger)
+    add_dependencies(viewer solaris-crash-logger)
+  endif (LINUX)
+
+  add_subdirectory(${VIEWER_PREFIX}newview)
+  add_dependencies(viewer secondlife-bin)
 
 if (LL_TESTS)
   # Define after the custom targets are created so