fixes for linux cmake dependency 2.6

Change-Id: I18f48b4cb63a6838908a6f3d26d85c81cfcab40a