Decoupled ITS/UPGRADE cmake stuff from ITS