Minimized some of the CMake code.
Realized I previously used some duplicate code that could be avoided.