make a workable cmake
Merge branch 'master' of github.com:wangjiangb/caffe