[devel] More bugfixes and improvements to CMakeLists.txt

(Contributed by Philip Lowman)
3 files changed