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

backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6

meow-7.2.2
Glenn Glazer 2016-05-23 12:08:59 -07:00
parent 8c45877871
commit 9c28c06f1d
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/CMakeLists.txt
View File

@ -1310,6 +1310,11 @@ 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
add_custom_target(generate_viewer_version ALL
COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
COMMENT Generating viewer_version.txt for manifest processing
)
set_source_files_properties(
llversioninfo.cpp tests/llversioninfo_test.cpp
@ -1318,14 +1323,6 @@ set_source_files_properties(
COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.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
add_custom_target(generate_viewer_version ALL
COMMAND printf '${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}' > ${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
COMMENT Generating viewer_version.txt for manifest processing
)
if (DARWIN)
LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp)
LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm)

5
indra/newview/summary.json.in
View File

@ -1,5 +0,0 @@
{
"Type":"viewer",
"Version":"@SUMMARY_VERSION@",
"Channel":"@SUMMARY_CHANNEL@"
}