livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove only-partially-successful attempt to put teamcity blocks around targets

master
Oz Linden 2018-09-07 09:13:57 -04:00
parent 9f27bff9fb
commit 9fd463bd94
36 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/CMakeLists.txt
View File

@ -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)

23
indra/cmake/00-Common.cmake
View File

@ -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)

3
indra/cmake/LLAddBuildTest.cmake
View File

@ -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}"

1
indra/integration_tests/llimage_libtest/CMakeLists.txt
View File

@ -41,7 +41,6 @@ add_executable(llimage_libtest
MACOSX_BUNDLE
${llimage_libtest_SOURCE_FILES}
)
buildscripts_block(llimage_libtest)
set_target_properties(llimage_libtest
PROPERTIES

1
indra/integration_tests/llui_libtest/CMakeLists.txt
View File

@ -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)

2
indra/linux_crash_logger/CMakeLists.txt
View File

@ -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)

2
indra/llappearance/CMakeLists.txt
View File

@ -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}

1
indra/llaudio/CMakeLists.txt
View File

@ -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}

1
indra/llcharacter/CMakeLists.txt
View File

@ -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

2
indra/llcommon/CMakeLists.txt
View File

@ -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

2
indra/llcorehttp/CMakeLists.txt
View File

@ -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}"

1
indra/llcrashlogger/CMakeLists.txt
View File

@ -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)

1
indra/llimage/CMakeLists.txt
View File

@ -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)

1
indra/llimagej2coj/CMakeLists.txt
View File

@ -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

1
indra/llinventory/CMakeLists.txt
View File

@ -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)

1
indra/llkdu/CMakeLists.txt
View File

@ -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})

1
indra/llmath/CMakeLists.txt
View File

@ -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}

1
indra/llmessage/CMakeLists.txt
View File

@ -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(

1
indra/llplugin/CMakeLists.txt
View File

@ -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)

1
indra/llplugin/slplugin/CMakeLists.txt
View File

@ -49,7 +49,6 @@ add_executable(SLPlugin
MACOSX_BUNDLE
${SLPlugin_SOURCE_FILES}
)
buildscripts_block(SLPlugin)
if (WINDOWS)
set_target_properties(SLPlugin

1
indra/llprimitive/CMakeLists.txt
View File

@ -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}

2
indra/llrender/CMakeLists.txt
View File

@ -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

1
indra/llui/CMakeLists.txt
View File

@ -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

1
indra/llvfs/CMakeLists.txt
View File

@ -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}

2
indra/llwindow/CMakeLists.txt
View File

@ -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

1
indra/llxml/CMakeLists.txt
View File

@ -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

1
indra/mac_crash_logger/CMakeLists.txt
View File

@ -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

1
indra/media_plugins/base/CMakeLists.txt
View File

@ -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)

1
indra/media_plugins/cef/CMakeLists.txt
View File

@ -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}

1
indra/media_plugins/example/CMakeLists.txt
View File

@ -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}

1
indra/media_plugins/gstreamer010/CMakeLists.txt
View File

@ -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}

1
indra/media_plugins/libvlc/CMakeLists.txt
View File

@ -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}

7
indra/newview/CMakeLists.txt
View File

@ -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)

1
indra/test/CMakeLists.txt
View File

@ -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}

1
indra/viewer_components/login/CMakeLists.txt
View File

@ -42,7 +42,6 @@ list(APPEND
add_library(lllogin
${login_SOURCE_FILES}
)
buildscripts_block(lllogin)
target_link_libraries(lllogin
${LLMESSAGE_LIBRARIES}

1
indra/win_crash_logger/CMakeLists.txt
View File

@ -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}