diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-28 01:03:56 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-28 01:03:56 +0300 |
| commit | 057c034cb4584fb70f63a1572be0ff2219ad6294 (patch) | |
| tree | 069ecea204f81c380f484caa6aac41c29184ed3e /indra/newview/CMakeLists.txt | |
| parent | 817ae347744eab55ee1f8084102fbc8dc5195f3a (diff) | |
| parent | 0d5edb03a226a62bb416ddca250e4f1f789f56fd (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8d863631cf..dce0ea73cd 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1315,13 +1315,10 @@ set(viewer_HEADER_FILES source_group("CMake Rules" FILES ViewerInstall.cmake) +#summary.json creation moved to viewer_manifest.py MAINT-6413 # 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 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n") -file(WRITE "${CMAKE_BINARY_DIR}/summary.json" - "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\"}\n") set_source_files_properties( llversioninfo.cpp tests/llversioninfo_test.cpp |