Merging changes to CMakeLists.txt from cppaudio, adjustments valid in master too.