diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-22 11:09:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-22 11:09:43 -0400 |
| commit | 5758b9e304c182db93aa642358140d9464331208 (patch) | |
| tree | 0ad969a04f97242253ac1af5ed6e98eb992fea8d /indra/newview/CMakeLists.txt | |
| parent | 9ef64494559dce5f7c0afb271b591036054f01ce (diff) | |
| parent | 7fad053982d835ff5b9ec496bc94ddbedc234dcc (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4c535a952f..d06cee5ee6 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1252,8 +1252,12 @@ set(viewer_HEADER_FILES source_group("CMake Rules" FILES ViewerInstall.cmake) +# the viewer_version.txt file created here is for passing to viewer_manifest +# the summary.json file is created for the benefit of the TeamCity builds, where +# it is used to provide descriptive information to the build results page add_custom_target(generate_viewer_version ALL - COMMAND echo "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt + COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt + COMMAND printf '{"Type":"viewer","Version":"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}"}' > ${CMAKE_BINARY_DIR}/summary.json COMMENT Generating viewer_version.txt for manifest processing ) |