Merge pull request #2332 from ben-clayton/fix-cmake-include

Fix CMake rules when nesting CMake projects