diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-03-03 19:09:58 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-03-03 19:09:58 -0500 |
| commit | b45bff8ebd0befae3bb327d6d1dd992eb7dfd124 (patch) | |
| tree | 6773c3c2f8455ef610fa1289c8df7e86bed0a05f /indra/newview | |
| parent | 9436cc3c3b88745897cd1e3e3f58716143f610a3 (diff) | |
Commit Callum's fix to eliminate dependency on cygwin printf.
Use 'cmake -E echo' instead.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8c5bc9777c..530699cfd9 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1308,9 +1308,11 @@ source_group("CMake Rules" FILES ViewerInstall.cmake) # 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 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 + COMMENT Generating '${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt' for manifest processing + COMMAND ${CMAKE_COMMAND} -E echo '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt + + COMMENT Generating '${CMAKE_BINARY_DIR}/summary.json' for TeamCity builds + COMMAND ${CMAKE_COMMAND} -E echo '{"Type":"viewer","Version":"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}"}' > ${CMAKE_BINARY_DIR}/summary.json ) set_source_files_properties( |