diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-17 10:52:59 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-17 10:52:59 -0700 |
| commit | a382dcfb8dbc26fa7e73647bf996e9d166bfce6d (patch) | |
| tree | 30bcd7961827a2078caba67f047fffe0a3550952 | |
| parent | 58e9a5919952cbd0a5b2112bf5c72db09c4750ec (diff) | |
maint-6413: use file write as printf inserts escape chars
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5b39f622a6..34e1565707 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1310,13 +1310,14 @@ source_group("CMake Rules" FILES ViewerInstall.cmake) # the viewer_version.txt file created here is for passing to viewer_manifest and autobuild # 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 -# channel added to summary.json for programmatic access to that by VMP SL-321 add_custom_target(generate_viewer_version ALL 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}","Channel":"${VIEWER_CHANNEL}"}' > ${CMAKE_BINARY_DIR}/summary.json COMMENT Generating viewer_version.txt for manifest processing ) +#Channel added for VMP programmatic access. MAINT-6413/SL-321 +file(WRITE ${CMAKE_BINARY_DIR}/summary.json '{"Type":"viewer","Version":"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}","Channel","${VIEWER_CHANNEL}"}') + set_source_files_properties( llversioninfo.cpp tests/llversioninfo_test.cpp PROPERTIES |