summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-09-07 08:30:21 -0400
committerOz Linden <oz@lindenlab.com>2018-09-07 08:30:21 -0400
commitfac16e53f6b806245b16229b53eb325a5875fc59 (patch)
treeb500aef74f7a58f0ffdf9c8963c9d44dafa849a6 /indra
parent050f9ead3b7509a5a03cb41492386414db15e5e0 (diff)
refine TeamCity blocks to avoid double nesting, and disable
for Windows
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/00-Common.cmake18
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 24f6329d10..503f4208fe 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -219,22 +219,24 @@ endif (USESYSTEMLIBS)
macro (buildscripts_block target_name)
# add custom commands to bracket a target build to make logs easier to read
-
- if (DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
+ # 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 "##teamcity[blockOpened name='${target_name}']" VERBATIM
+ COMMAND echo ARGS "-n" "##"
+ COMMAND echo ARGS "teamcity[blockOpened name='${target_name}']"
)
add_custom_command(TARGET ${target_name} POST_BUILD
- COMMAND echo ARGS "##teamcity[blockClosed name='${target_name}']" VERBATIM
+ COMMAND echo ARGS "-n" "##"
+ COMMAND echo ARGS "teamcity[blockClosed name='${target_name}']"
)
- else (DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
+ else (NOT WINDOWS AND DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
add_custom_command(TARGET ${target_name} PRE_BUILD
- COMMAND echo ARGS "################## START ${target_name}" VERBATIM
+ COMMAND echo ARGS "################## START ${target_name}"
)
add_custom_command(TARGET ${target_name} POST_BUILD
- COMMAND echo ARGS "################## FINISH ${target_name}" VERBATIM
+ COMMAND echo ARGS "################## FINISH ${target_name}"
)
- endif (DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
+ endif (NOT WINDOWS AND DEFINED ENV{TEAMCITY_BUILDCONF_NAME})
endmacro (buildscripts_block target_name)