diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 08d0c7b51014591bf9138d6d58db5e7c0af77ca2..6c20a813bad182415bf5ca7665a1055c9bf0717a 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -44,7 +44,6 @@ if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
 endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
 
 add_custom_target(viewer)
-buildscripts_block(viewer)
 
 add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
 add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 503f4208febbe496bf14ac23d253e2abd4ac9aa7..40fc706a9908b02a80bc4f1eb4ef0edd9192a951 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -217,27 +217,4 @@ else (USESYSTEMLIBS)
       )
 endif (USESYSTEMLIBS)
 
-macro (buildscripts_block target_name)
-    # add custom commands to bracket a target build to make logs easier to read
-    # this is disabled for windows because VS interleaves output in a way that defeats it
-    if (NOT WINDOWS AND DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
-        add_custom_command(TARGET ${target_name} PRE_BUILD
-            COMMAND echo ARGS "-n" "##"
-            COMMAND echo ARGS "teamcity[blockOpened name='${target_name}']" 
-            )
-        add_custom_command(TARGET ${target_name} POST_BUILD
-            COMMAND echo ARGS "-n" "##"
-            COMMAND echo ARGS "teamcity[blockClosed name='${target_name}']"
-            )
-    else (NOT WINDOWS AND DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
-        add_custom_command(TARGET ${target_name} PRE_BUILD
-            COMMAND echo ARGS "################## START ${target_name}"
-            )
-        add_custom_command(TARGET ${target_name} POST_BUILD
-            COMMAND echo ARGS "################## FINISH ${target_name}"
-            )
-    endif (NOT WINDOWS AND DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
-
-endmacro (buildscripts_block target_name)
-
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 3b5bc0af7c22daff8d4e0a7a0feba3fcef95868e..b3f42c1a5e93048fae218d570e780b79595758f6 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -105,7 +105,6 @@ INCLUDE(GoogleMock)
 
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
-    buildscripts_block(PROJECT_${project}_TEST_${name})
     SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
     #
@@ -167,7 +166,6 @@ INCLUDE(GoogleMock)
   # Add the test runner target per-project
   # (replaces old _test_ok targets all over the place)
   ADD_CUSTOM_TARGET(${project}_tests ALL DEPENDS ${${project}_TEST_OUTPUT})
-  buildscripts_block(${project}_tests)
   ADD_DEPENDENCIES(${project} ${project}_tests)
 ENDMACRO(LL_ADD_PROJECT_UNIT_TESTS)
 
@@ -215,7 +213,6 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})")
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
-  buildscripts_block(INTEGRATION_TEST_${testname})
   SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
     PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}"
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index 4e23a1fc8792c6a151a087ebc939b25a0994163e..d9353f904c2c23588a1b22bdb1876702c0664eea 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -41,7 +41,6 @@ add_executable(llimage_libtest
     MACOSX_BUNDLE
     ${llimage_libtest_SOURCE_FILES}
     )
-buildscripts_block(llimage_libtest)
 
 set_target_properties(llimage_libtest
     PROPERTIES
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index 2d21f9af0f9c557628e437f7344479deab949345..34e34c7e470d632dfb7160aaee5c5d5e6047276a 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -56,7 +56,6 @@ set_source_files_properties(${llui_libtest_HEADER_FILES}
 list(APPEND llui_libtest_SOURCE_FILES ${llui_libtest_HEADER_FILES})
 
 add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
-buildscripts_block(llui_libtest)
 
 # Link with OS-specific libraries for LLWindow dependency
 if (DARWIN)
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 165b33fedebbfa9087263c50416cbe5672682aec..315aed8d114e2185016a0dc7d44ef67cd7cb1557 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -55,7 +55,6 @@ list(APPEND linux_crash_logger_SOURCE_FILES
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
 
 add_executable(linux-crash-logger ${linux_crash_logger_SOURCE_FILES})
-buildscripts_block(linux-crash-logger)
 
 # llcommon uses `clock_gettime' which is provided by librt on linux.
 set(LIBRT_LIBRARY rt)
@@ -80,4 +79,3 @@ target_link_libraries(linux-crash-logger
 
 add_custom_target(linux-crash-logger-target ALL
     DEPENDS linux-crash-logger)
-buildscripts_block(linux-crash-logger-target)
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt
index ad33fed01048afc4e4b99ab7455e23e649533bf2..20eb4678dd223b987fc535d89ef06ba43421b1ee 100644
--- a/indra/llappearance/CMakeLists.txt
+++ b/indra/llappearance/CMakeLists.txt
@@ -77,7 +77,6 @@ set_source_files_properties(${llappearance_HEADER_FILES}
 list(APPEND llappearance_SOURCE_FILES ${llappearance_HEADER_FILES})
 
 add_library (llappearance ${llappearance_SOURCE_FILES})
-buildscripts_block(llappearance)
 
 target_link_libraries(llappearance
     ${LLCHARACTER_LIBRARIES}
@@ -95,7 +94,6 @@ target_link_libraries(llappearance
 
 if (BUILD_HEADLESS)
   add_library (llappearanceheadless ${llappearance_SOURCE_FILES})
-  buildscripts_block(llappearanceheadless)
   
   target_link_libraries(llappearanceheadless
       ${LLCHARACTER_LIBRARIES}
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index fc81d8c6f21db6e57dbbeb5ac990cd58977a03aa..e943dd5d5ccd059100c1ad41507a3f5d377b73d1 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -77,7 +77,6 @@ set_source_files_properties(${llaudio_HEADER_FILES}
 list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})
 
 add_library (llaudio ${llaudio_SOURCE_FILES})
-buildscripts_block(llaudio)
 target_link_libraries(
     llaudio
     ${LLCOMMON_LIBRARIES}
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index 3d0eb09ada353365dfb817657c41697a364c4ce2..a17a5b0aa6bee291b535ffb0bc257ed10708cad7 100644
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -79,7 +79,6 @@ set_source_files_properties(${llcharacter_HEADER_FILES}
 list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
 
 add_library (llcharacter ${llcharacter_SOURCE_FILES})
-buildscripts_block(llcharacter)
 
 target_link_libraries(
     llcharacter
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 0d58a59e3f9426ba7cbe5f7417c342fc15cb5563..42ad56f1b0b42114ae67244159afc61f198baaad 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -24,7 +24,6 @@ include_directories(
     )
 
 # add_executable(lltreeiterators lltreeiterators.cpp)
-# buildscripts_block(lltreeiterators)
 # 
 # target_link_libraries(lltreeiterators
 #     ${LLCOMMON_LIBRARIES})
@@ -280,7 +279,6 @@ if(LLCOMMON_LINK_SHARED)
 else(LLCOMMON_LINK_SHARED)
     add_library (llcommon ${llcommon_SOURCE_FILES})
 endif(LLCOMMON_LINK_SHARED)
-buildscripts_block(llcommon)
 
 target_link_libraries(
     llcommon
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index c42bd7b6b2db8a320f6e132816a49c96e8e22693..9dbc6f447ec272f0fbe4d5e361a84e565ee609c0 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -90,7 +90,6 @@ endif (DARWIN OR LINUX)
 list(APPEND llcorehttp_SOURCE_FILES ${llcorehttp_HEADER_FILES})
 
 add_library (llcorehttp ${llcorehttp_SOURCE_FILES})
-buildscripts_block(llcorehttp)
 target_link_libraries(
   llcorehttp
   ${CURL_LIBRARIES}
@@ -215,7 +214,6 @@ endif (DARWIN)
   add_executable(http_texture_load
                  ${llcorehttp_EXAMPLE_SOURCE_FILES}
                  )
-  buildscripts_block(http_texture_load)
   set_target_properties(http_texture_load
                         PROPERTIES
                         RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}"
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
index 7d7f3f0167a041edcfd07f04a82e6964082d2103..da23b46b7b1ad99b45ad2a4bd7205fbbef8c2fd2 100644
--- a/indra/llcrashlogger/CMakeLists.txt
+++ b/indra/llcrashlogger/CMakeLists.txt
@@ -41,4 +41,3 @@ set_source_files_properties(${llcrashlogger_HEADER_FILES}
 list(APPEND llcrashlogger_SOURCE_FILES ${llcrashlogger_HEADER_FILES})
 
 add_library(llcrashlogger ${llcrashlogger_SOURCE_FILES})
-buildscripts_block(llcrashlogger)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index 4b57a7799916564ca9e19e1eca5023d11b43f4f1..293ada7548e598a182bed2402b45cba2c84f81ac 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -59,7 +59,6 @@ set_source_files_properties(${llimage_HEADER_FILES}
 list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
 
 add_library (llimage ${llimage_SOURCE_FILES})
-buildscripts_block(llimage)
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 if (USE_KDU)
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt
index f05842b7211a90499c9d34d05d1c26b0e60698ea..c9423d50dd618e91a593edc0222a99c63bca44cb 100644
--- a/indra/llimagej2coj/CMakeLists.txt
+++ b/indra/llimagej2coj/CMakeLists.txt
@@ -29,7 +29,6 @@ set_source_files_properties(${llimagej2coj_HEADER_FILES}
 list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
-buildscripts_block(llimagej2coj)
 
 target_link_libraries(
     llimagej2coj
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index 6a5892127dba55131e0c3639644b478e9c17259e..68dd00d88060b50086c982a02e7a7fd521131608 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -60,7 +60,6 @@ set_source_files_properties(${llinventory_HEADER_FILES}
 list(APPEND llinventory_SOURCE_FILES ${llinventory_HEADER_FILES})
 
 add_library (llinventory ${llinventory_SOURCE_FILES})
-buildscripts_block(llinventory)
 
 
 
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index 59f6d08517290d2b84874d4045048e0d38021739..cb0e204e91a6f2eb26c839727cd6b8d20e08380d 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -50,7 +50,6 @@ set_source_files_properties(${llkdu_SOURCE_FILES}
 
 if (USE_KDU)
   add_library (llkdu ${llkdu_SOURCE_FILES})
-  buildscripts_block(llkdu)
 
   target_link_libraries(llkdu
     ${KDU_LIBRARY})
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index 110173add3eefdd4579f7ac6325c76af484864e4..4c8bcdac917eb856022ac9626e33dc0cb74ce0bc 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -101,7 +101,6 @@ set_source_files_properties(${llmath_HEADER_FILES}
 list(APPEND llmath_SOURCE_FILES ${llmath_HEADER_FILES})
 
 add_library (llmath ${llmath_SOURCE_FILES})
-buildscripts_block(llmath)
 
 target_link_libraries(llmath
     ${LLCOMMON_LIBRARIES}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index ab59c8bb40849fbc49094c20f38f7103d507d5d0..e0922c0667d714c05a652f354a2382b98f976fd2 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -203,7 +203,6 @@ set_source_files_properties(${llmessage_HEADER_FILES}
 list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
 
 add_library (llmessage ${llmessage_SOURCE_FILES})
-buildscripts_block(llmessage)
 
 if (LINUX)
 target_link_libraries(
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 9d79eabbb338cfa45bc3a9370338cf38d85fa3e3..5cc129a2677fffb80c5e27a67e07a63f733a26b3 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -65,7 +65,6 @@ endif(NOT ADDRESS_SIZE EQUAL 32)
 list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
-buildscripts_block(llplugin)
 
 add_subdirectory(slplugin)
 
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 3a9d661ff62a22c227f2d2a18d092e9b31967680..33520ad64c25ba32900563e8d48dd14515ce9b7f 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -49,7 +49,6 @@ add_executable(SLPlugin
     MACOSX_BUNDLE
     ${SLPlugin_SOURCE_FILES}
     )
-buildscripts_block(SLPlugin)
 
 if (WINDOWS)
 set_target_properties(SLPlugin
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 12c6882844a8e02ad0f45aaee598fd9c093c8986..dd2e806dda2ae942010336d3744b0af72cdf207a 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -71,7 +71,6 @@ set_source_files_properties(${llprimitive_HEADER_FILES}
 list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES})
 
 add_library (llprimitive ${llprimitive_SOURCE_FILES})
-buildscripts_block(llprimitive)
 
 target_link_libraries(llprimitive
     ${LLCOMMON_LIBRARIES}
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index de5f24758c4270f301620bf24c6ac4e4a665e7b8..07a0d8c402d0906338d9ee87dfc23974211dae83 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -91,7 +91,6 @@ if (BUILD_HEADLESS)
   add_library (llrenderheadless
     ${llrender_SOURCE_FILES}
     )
-  buildscripts_block(llrenderheadless)
 
   set_property(TARGET llrenderheadless
     PROPERTY COMPILE_DEFINITIONS LL_MESA=1 LL_MESA_HEADLESS=1
@@ -111,7 +110,6 @@ if (BUILD_HEADLESS)
 endif (BUILD_HEADLESS)
 
 add_library (llrender ${llrender_SOURCE_FILES})
-buildscripts_block(llrender)
 
 if (SDL_FOUND)
   set_property(TARGET llrender
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 41a79d5752193feaac737a7b24ae4ae7174e0c08..8054eb36199cdf57ebc8bafea46b1c026911b00a 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -269,7 +269,6 @@ set_source_files_properties(llurlentry.cpp
 list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
 
 add_library (llui ${llui_SOURCE_FILES})
-buildscripts_block(llui)
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 target_link_libraries(llui
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt
index a9d602d3331d7883d10ae66661075188d3cb70c9..67dce8c0737e7fda21ff4fb057451aeac2e1bc0f 100644
--- a/indra/llvfs/CMakeLists.txt
+++ b/indra/llvfs/CMakeLists.txt
@@ -64,7 +64,6 @@ set_source_files_properties(${llvfs_HEADER_FILES}
 list(APPEND llvfs_SOURCE_FILES ${llvfs_HEADER_FILES})
 
 add_library (llvfs ${llvfs_SOURCE_FILES})
-buildscripts_block(llvfs)
 
 set(vfs_BOOST_LIBRARIES
     ${BOOST_FILESYSTEM_LIBRARY}
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index d7ab3bfebbf71da441637717160cd09e76f63ae6..0743fd899f2795e5a07dea6c10a5f7c432c4bc52 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -175,7 +175,6 @@ if (BUILD_HEADLESS)
     ${llwindow_SOURCE_FILES}
     ${llwindowheadless_SOURCE_FILES}
     )
-  buildscripts_block(llwindowheadless)
   set_property(TARGET llwindowheadless
     PROPERTY COMPILE_DEFINITIONS LL_MESA=1 LL_MESA_HEADLESS=1
     )
@@ -192,7 +191,6 @@ endif (llwindow_HEADER_FILES)
     ${llwindow_SOURCE_FILES}
     ${viewer_SOURCE_FILES}
     )
-  buildscripts_block(llwindow)
 
 if (SDL_FOUND)
   set_property(TARGET llwindow
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index cb2d0f5c7692fb833d97b93e186bbd9a8662840b..17400a203e8485bb46b62f4011c60e1fe93fad36 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -40,7 +40,6 @@ set_source_files_properties(${llxml_HEADER_FILES}
 list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
 
 add_library (llxml ${llxml_SOURCE_FILES})
-buildscripts_block(llxml)
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 target_link_libraries( llxml
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index f62bab56739e2650b0b2bf111725975bb4b54647..f6c4dfb59da8ef3723a2b1ada85821cb45bf1e0a 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -58,7 +58,6 @@ list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
 add_executable(mac-crash-logger
   MACOSX_BUNDLE
   ${mac_crash_logger_SOURCE_FILES})
-buildscripts_block(mac-crash-logger)
 
 set_target_properties(mac-crash-logger
   PROPERTIES
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 8ab535e14c054e08572244274ce29ad1827fbc9a..7f2b82ffdd0b34c501b2a18f228eaafeb63ed7e7 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -49,5 +49,4 @@ set(media_plugin_base_HEADER_FILES
 add_library(media_plugin_base
     ${media_plugin_base_SOURCE_FILES}
     )
-buildscripts_block(media_plugin_base)
 
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index dedc47e34187467414d9003e3c9fefb1a13d9af7..ce6278963db537bc1f2498b37dd27d4fe9ae4b88 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -82,7 +82,6 @@ add_library(media_plugin_cef
     SHARED
     ${media_plugin_cef_SOURCE_FILES}
     )
-buildscripts_block(media_plugin_cef)
 
 #add_dependencies(media_plugin_cef
 #  ${MEDIA_PLUGIN_BASE_LIBRARIES}
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 95d3d5b5a25a192d12e65d973b6400a435fb275c..eb067a7f6e56a204c59b8f0a2a1d07cbdbc5b7cb 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library(media_plugin_example
     SHARED
     ${media_plugin_example_SOURCE_FILES}
     )
-buildscripts_block(media_plugin_example)
 
 target_link_libraries(media_plugin_example
   ${LLPLUGIN_LIBRARIES}
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index 18b4b761cf44fcbfd111ec7710b6d145f4c71546..571eb57b248f95b1ee5debd51d72d2c2bdf9208e 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -57,7 +57,6 @@ add_library(media_plugin_gstreamer010
     SHARED
     ${media_plugin_gstreamer010_SOURCE_FILES}
     )
-buildscripts_block(media_plugin_gstreamer010)
 
 target_link_libraries(media_plugin_gstreamer010
   ${LLPLUGIN_LIBRARIES}
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 7946e7ccfc128475bc34fe9e9f557c63ffec60b3..97392bbe089f960db59ab3f374d4082df80209d1 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -49,7 +49,6 @@ add_library(media_plugin_libvlc
     SHARED
     ${media_plugin_libvlc_SOURCE_FILES}
     )
-buildscripts_block(media_plugin_libvlc)
 
 target_link_libraries(media_plugin_libvlc
   ${LLPLUGIN_LIBRARIES}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 560c9d07373436eeb2cf2019e1a3a1cf8e2c58b5..e573b927d7a98916bb40a7f4c5546182e8c3ccd4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1722,7 +1722,6 @@ add_executable(${VIEWER_BINARY_NAME}
     MACOSX_BUNDLE
     ${viewer_SOURCE_FILES}
     )
-buildscripts_block(${VIEWER_BINARY_NAME})
 
 if (SDL_FOUND)
   set_property(TARGET ${VIEWER_BINARY_NAME}
@@ -1915,7 +1914,6 @@ if (WINDOWS)
         ${CMAKE_CFG_INTDIR}/touched.bat
         windows-setup-build-all
         )
-      buildscripts_block(llpackage)
         # temporarily disable packaging of event_host until hg subrepos get
         # sorted out on the parabuild cluster...
         #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
@@ -2255,7 +2253,6 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
           VERBATIM)
 
     add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME} "${VIEWER_COPY_MANIFEST}")
-    buildscripts_block(generate_symbols)
     add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})
     if (WINDOWS OR LINUX)
       add_dependencies(generate_symbols "${VIEWER_COPY_MANIFEST}")
@@ -2288,7 +2285,6 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         COMMENT "Packing viewer PDB into ${VIEWER_SYMBOL_FILE_CYGWIN}"
         )
       add_custom_target(generate_symbols DEPENDS "${VIEWER_SYMBOL_FILE}" ${VIEWER_BINARY_NAME})
-      buildscripts_block(generate_symbols)
       add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})
     endif (WINDOWS)
     if (DARWIN)
@@ -2300,7 +2296,6 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         COMMENT "Generating ${VIEWER_APP_DSYM}"
         )
       add_custom_target(dsym_generate DEPENDS "${VIEWER_APP_DSYM}")
-      buildscripts_block(dsym_generate)
       add_dependencies(dsym_generate ${VIEWER_BINARY_NAME})
       add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
         # See above comments about "tar ...j"
@@ -2315,7 +2310,6 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         COMMENT "Packing dSYM into ${VIEWER_SYMBOL_FILE}"
         )
       add_custom_target(dsym_tarball DEPENDS "${VIEWER_SYMBOL_FILE}")
-      buildscripts_block(dsym_tarball)
       add_dependencies(dsym_tarball dsym_generate)
       add_custom_command(OUTPUT "${VIEWER_APP_XCARCHIVE}"
         COMMAND "zip"
@@ -2343,7 +2337,6 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
         "${VIEWER_APP_XCARCHIVE}"
         "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp"
         )
-      buildscripts_block(generate_symbols)
       add_dependencies(generate_symbols dsym_tarball dsym_xcarchive)
     endif (DARWIN)
     if (LINUX)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 11ec2226ea0200be0f8286479dfd4ee6b0828cdb..8344cead57c32a8f80a01bea1a3f284b2fb11c52 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -81,7 +81,6 @@ set_source_files_properties(${test_HEADER_FILES}
 list(APPEND test_SOURCE_FILES ${test_HEADER_FILES})
 
 add_executable(lltest ${test_SOURCE_FILES})
-buildscripts_block(lltest)
 
 target_link_libraries(lltest
     ${LLDATABASE_LIBRARIES}
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 79706e0df453c98a05e23201030626fde054c283..3bedeb7292ff310cea76b22fd6bd5cfe220e9f8d 100644
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -42,7 +42,6 @@ list(APPEND
 add_library(lllogin 
             ${login_SOURCE_FILES}
             )
-buildscripts_block(lllogin)
 
 target_link_libraries(lllogin
     ${LLMESSAGE_LIBRARIES}
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 9d651fcbc99d540ee301d49abcdb4c214c177247..144d037a319e69436a60d2999adc836f1c23d920 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -71,7 +71,6 @@ list(APPEND
 find_library(DXGUID_LIBRARY dxguid ${DIRECTX_LIBRARY_DIR})
 
 add_executable(windows-crash-logger WIN32 ${win_crash_logger_SOURCE_FILES})
-buildscripts_block(windows-crash-logger)
 
 target_link_libraries(windows-crash-logger
     ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}