Merge pull request #2283 from BioDataAnalysis/bda_cmake_improvements

Diverse cmake improvements in dependency handling