Ensure pietestgui is installed

[cwilling]

Signed-off-by: Christoph Willing chris.willing@linux.com

[cwilling]

The current 'configure/make/make install' omits installing pietestgui. This PR adds pietestgui to the installation list.

[michaelhatPIengineering]

I would be happy to merge this but there are conflicts.

<<<<<<< gui-executable
TARGET_LINK_LIBRARIES(pietestgui
Qt5::Core
Qt5::Gui
Qt5::Widgets
piehid
)

INSTALL(TARGETS pietestgui
RUNTIME DESTINATION bin
)

INSTALL(FILES pietestgui.desktop DESTINATION share/applications)

master

how to I resolve them so I can merge?

Sorry, my life is usually at the USB byte level, where my only task is to manage 36 bytes.

Michael

[cwilling]

I'm not sure but it may be because #9 was applied before #7. I'll reload what's in the repo right now and make a new PR. Leave this one as it is - I think I can make the changes in place. If not, I'll just submit a new PR.

[michaelhatPIengineering]

ok thanks Sorry I got it in the wrong order...

…

________________________________ From: cwilling ***@***.***> Sent: Friday, April 9, 2021 8:36 AM To: piengineering/X-keys_Linux ***@***.***> Cc: Michael Hetherington ***@***.***>; Comment ***@***.***> Subject: Re: [piengineering/X-keys_Linux] Ensure pietestgui is installed (#7) I'm not sure but it may be because #9<#9> was applied before #7<#7>. I'll reload what's in the repo right now and make a new PR. Leave this one as it is - I think I can make the changes in place. If not, I'll just submit a new PR. — You are receiving this because you commented. Reply to this email directly, view it on GitHub<#7 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AS6L3QUN7DMSGG5GMIPLJUTTH3YGHANCNFSM42R3ABIA>.

[cwilling]

Actually, it wasn't the ordering. It was because I made changes to the same file in different PRs, so my mistake.

I've fixed it now so should be OK to merge.