diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-06 13:00:16 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-06 13:00:16 -0800 |
| commit | 476f5496bb23f6eb93b1d1f0fdda379f385f2035 (patch) | |
| tree | 588e56f32db31286609b3d7dc7d1e4ef7b6b394c /indra/cmake | |
| parent | be04be34557355652ad2318904335eafed30add9 (diff) | |
| parent | 199d3c5675b4acd00e50b0fb0a2ebe01985e668d (diff) | |
Merge with fix to run packages-formatter
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/BuildPackagesInfo.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index 0f574ee39a..d22c64349a 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -2,9 +2,17 @@ # 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} + ${PYTHON_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py > packages-info.txt ) |