Improved Linux CMake build - Part 1