diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-06 11:48:43 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-06 11:48:43 -0500 |
| commit | bae76ec8df0fbc8d883413de250c6a93baa31448 (patch) | |
| tree | bb0ae8d5295f4c60a4b2af9109cb3b4a3c8b38e0 /indra/cmake | |
| parent | e6b9174bba29b6fcbb611280f7bfd06c40d3193e (diff) | |
DRTVWR-418: Set AUTOBUILD_ADDRSIZE for packages-formatter.py.
This handles the case of building within an IDE, in which AUTOBUILD_ADDRSIZE
isn't already set.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/BuildPackagesInfo.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index 0f574ee39a..367511bfb7 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -2,9 +2,16 @@ # Construct the version and copyright information based on package data. include(Python) +# packages-formatter.py runs autobuild install --versions, which needs to know +# the build_directory, which (on Windows) depends on AUTOBUILD_ADDRSIZE. +# Within an autobuild build, AUTOBUILD_ADDRSIZE is already set. But when +# building in an IDE, it probably isn't. Set it explicitly using +# run_build_test.py. add_custom_command(OUTPUT packages-info.txt COMMENT Generating packages-info.txt for the about box MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt + COMMAND ${PYTHON_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} + ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt ) |