Skip to content

fix(cmake): key the GUI merge on the GUI target, not on TouchGFX #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobymurray wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

fix(cmake): key the GUI merge on the GUI target, not on TouchGFX #283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmake/una-app.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,13 @@ function(una_app_build_app)
)
endforeach()

# Final app merging
# Final app merging. The merge needs the GUI ELF packed first, so ask whether
# one was built rather than whether TouchGFX built it: a CustomGUI app sets no
# TOUCHGFX_PATH, and keying on that left app_merging.py racing the packer.
# TOUCHGFX_PATH stays for apps calling this before una_app_build_gui(), where
# the target does not exist yet and DEPENDS resolves at generate time.
set(APP_DEPENDS ${APP_NAME}Service.elf)
if(DEFINED TOUCHGFX_PATH)
if(TARGET ${APP_NAME}GUI.elf OR DEFINED TOUCHGFX_PATH)
list(APPEND APP_DEPENDS ${APP_NAME}GUI.elf)
endif()
set(APP_AUTOSTART_FLAG "")
Expand Down
Loading