Fix CMake Compiling
!2083 (merged) moved some files around and added a few new ones, but didn't update the "CMakeLists.txt" files appropriately, causing CMake to lose its way when trying to generated the build project. This merge request fixes that; fixes #1116 (closed).
-
TL;DR: Fixed CMake compiling