Fixed Linux CMake Build - Part 2