Skip to content
Snippets Groups Projects
Commit bae76ec8 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent e6b9174b
No related branches found
No related tags found
No related merge requests found
...@@ -2,9 +2,16 @@ ...@@ -2,9 +2,16 @@
# Construct the version and copyright information based on package data. # Construct the version and copyright information based on package data.
include(Python) 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 add_custom_command(OUTPUT packages-info.txt
COMMENT Generating packages-info.txt for the about box COMMENT Generating packages-info.txt for the about box
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py 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
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment