fixed build on cmake <2.8.12 #983
Merge branch 'merge-libs' into merge-libs-master