updated cmake to account for 1.4
merging with biicode master