Installed software report with location included

Hi guys,

I need to make a report showing major installed programs( adobe, office,) on client computers for licensing compliance, however I also need the report to show the location of the pc.....

I was brainstorming this and thought i could either link the report to the pc's AD ou... but i dont like to rely on data from AD. the other option would be to create a table with ip address associated to their location and link that to the software report.

I was just wondering if there is anyone who tackled this already.... someadvise on how to approach this would be great.