Prepare for externalproject compilation

Merge request reports